X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=248baac760cecccfade6af4180ae8ff37fb0de3a;hp=6fe761233db55a19041fbd3bbe03ead6e5d2b29a;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=9bb5afc90d6cfc8afe492068aae3f8612319b6f4 diff --git a/vid_sdl.c b/vid_sdl.c index 6fe76123..248baac7 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -1285,540 +1285,6 @@ void Sys_SendKeyEvents( void ) // Video system //// -#ifdef USE_GLES2 -#ifndef qglClear -#ifdef __IPHONEOS__ -#include -#else -#include -#endif - -//#define PRECALL //Con_Printf("GLCALL %s:%i\n", __FILE__, __LINE__) -#define PRECALL -#define POSTCALL -GLboolean wrapglIsBuffer(GLuint buffer) {PRECALL;return glIsBuffer(buffer);POSTCALL;} -GLboolean wrapglIsEnabled(GLenum cap) {PRECALL;return glIsEnabled(cap);POSTCALL;} -GLboolean wrapglIsFramebuffer(GLuint framebuffer) {PRECALL;return glIsFramebuffer(framebuffer);POSTCALL;} -//GLboolean wrapglIsQuery(GLuint qid) {PRECALL;return glIsQuery(qid);POSTCALL;} -GLboolean wrapglIsRenderbuffer(GLuint renderbuffer) {PRECALL;return glIsRenderbuffer(renderbuffer);POSTCALL;} -//GLboolean wrapglUnmapBuffer(GLenum target) {PRECALL;return glUnmapBuffer(target);POSTCALL;} -GLenum wrapglCheckFramebufferStatus(GLenum target) {PRECALL;return glCheckFramebufferStatus(target);POSTCALL;} -GLenum wrapglGetError(void) {PRECALL;return glGetError();POSTCALL;} -GLuint wrapglCreateProgram(void) {PRECALL;return glCreateProgram();POSTCALL;} -GLuint wrapglCreateShader(GLenum shaderType) {PRECALL;return glCreateShader(shaderType);POSTCALL;} -//GLuint wrapglGetHandle(GLenum pname) {PRECALL;return glGetHandle(pname);POSTCALL;} -GLint wrapglGetAttribLocation(GLuint programObj, const GLchar *name) {PRECALL;return glGetAttribLocation(programObj, name);POSTCALL;} -GLint wrapglGetUniformLocation(GLuint programObj, const GLchar *name) {PRECALL;return glGetUniformLocation(programObj, name);POSTCALL;} -//GLvoid* wrapglMapBuffer(GLenum target, GLenum access) {PRECALL;return glMapBuffer(target, access);POSTCALL;} -const GLubyte* wrapglGetString(GLenum name) {PRECALL;return (const GLubyte*)glGetString(name);POSTCALL;} -void wrapglActiveStencilFace(GLenum e) {PRECALL;Con_Printf("glActiveStencilFace(e)\n");POSTCALL;} -void wrapglActiveTexture(GLenum e) {PRECALL;glActiveTexture(e);POSTCALL;} -void wrapglArrayElement(GLint i) {PRECALL;Con_Printf("glArrayElement(i)\n");POSTCALL;} -void wrapglAttachShader(GLuint containerObj, GLuint obj) {PRECALL;glAttachShader(containerObj, obj);POSTCALL;} -//void wrapglBeginQuery(GLenum target, GLuint qid) {PRECALL;glBeginQuery(target, qid);POSTCALL;} -void wrapglBindAttribLocation(GLuint programObj, GLuint index, const GLchar *name) {PRECALL;glBindAttribLocation(programObj, index, name);POSTCALL;} -//void wrapglBindFragDataLocation(GLuint programObj, GLuint index, const GLchar *name) {PRECALL;glBindFragDataLocation(programObj, index, name);POSTCALL;} -void wrapglBindBuffer(GLenum target, GLuint buffer) {PRECALL;glBindBuffer(target, buffer);POSTCALL;} -void wrapglBindFramebuffer(GLenum target, GLuint framebuffer) {PRECALL;glBindFramebuffer(target, framebuffer);POSTCALL;} -void wrapglBindRenderbuffer(GLenum target, GLuint renderbuffer) {PRECALL;glBindRenderbuffer(target, renderbuffer);POSTCALL;} -void wrapglBindTexture(GLenum target, GLuint texture) {PRECALL;glBindTexture(target, texture);POSTCALL;} -void wrapglBlendEquation(GLenum e) {PRECALL;glBlendEquation(e);POSTCALL;} -void wrapglBlendFunc(GLenum sfactor, GLenum dfactor) {PRECALL;glBlendFunc(sfactor, dfactor);POSTCALL;} -void wrapglBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage) {PRECALL;glBufferData(target, size, data, usage);POSTCALL;} -void wrapglBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data) {PRECALL;glBufferSubData(target, offset, size, data);POSTCALL;} -void wrapglClear(GLbitfield mask) {PRECALL;glClear(mask);POSTCALL;} -void wrapglClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {PRECALL;glClearColor(red, green, blue, alpha);POSTCALL;} -void wrapglClearDepth(GLclampd depth) {PRECALL;/*Con_Printf("glClearDepth(%f)\n", depth);glClearDepthf((float)depth);*/POSTCALL;} -void wrapglClearStencil(GLint s) {PRECALL;glClearStencil(s);POSTCALL;} -void wrapglColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) {PRECALL;glColorMask(red, green, blue, alpha);POSTCALL;} -void wrapglCompileShader(GLuint shaderObj) {PRECALL;glCompileShader(shaderObj);POSTCALL;} -void wrapglCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data) {PRECALL;glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);POSTCALL;} -void wrapglCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data) {PRECALL;Con_Printf("glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)\n");POSTCALL;} -void wrapglCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data) {PRECALL;glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);POSTCALL;} -void wrapglCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data) {PRECALL;Con_Printf("glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)\n");POSTCALL;} -void wrapglCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) {PRECALL;glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);POSTCALL;} -void wrapglCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) {PRECALL;glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);POSTCALL;} -void wrapglCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) {PRECALL;Con_Printf("glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height)\n");POSTCALL;} -void wrapglCullFace(GLenum mode) {PRECALL;glCullFace(mode);POSTCALL;} -void wrapglDeleteBuffers(GLsizei n, const GLuint *buffers) {PRECALL;glDeleteBuffers(n, buffers);POSTCALL;} -void wrapglDeleteFramebuffers(GLsizei n, const GLuint *framebuffers) {PRECALL;glDeleteFramebuffers(n, framebuffers);POSTCALL;} -void wrapglDeleteShader(GLuint obj) {PRECALL;glDeleteShader(obj);POSTCALL;} -void wrapglDeleteProgram(GLuint obj) {PRECALL;glDeleteProgram(obj);POSTCALL;} -//void wrapglDeleteQueries(GLsizei n, const GLuint *ids) {PRECALL;glDeleteQueries(n, ids);POSTCALL;} -void wrapglDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) {PRECALL;glDeleteRenderbuffers(n, renderbuffers);POSTCALL;} -void wrapglDeleteTextures(GLsizei n, const GLuint *textures) {PRECALL;glDeleteTextures(n, textures);POSTCALL;} -void wrapglDepthFunc(GLenum func) {PRECALL;glDepthFunc(func);POSTCALL;} -void wrapglDepthMask(GLboolean flag) {PRECALL;glDepthMask(flag);POSTCALL;} -//void wrapglDepthRange(GLclampd near_val, GLclampd far_val) {PRECALL;glDepthRangef((float)near_val, (float)far_val);POSTCALL;} -void wrapglDepthRangef(GLclampf near_val, GLclampf far_val) {PRECALL;glDepthRangef(near_val, far_val);POSTCALL;} -void wrapglDetachShader(GLuint containerObj, GLuint attachedObj) {PRECALL;glDetachShader(containerObj, attachedObj);POSTCALL;} -void wrapglDisable(GLenum cap) {PRECALL;glDisable(cap);POSTCALL;} -void wrapglDisableVertexAttribArray(GLuint index) {PRECALL;glDisableVertexAttribArray(index);POSTCALL;} -void wrapglDrawArrays(GLenum mode, GLint first, GLsizei count) {PRECALL;glDrawArrays(mode, first, count);POSTCALL;} -void wrapglDrawBuffer(GLenum mode) {PRECALL;Con_Printf("glDrawBuffer(mode)\n");POSTCALL;} -void wrapglDrawBuffers(GLsizei n, const GLenum *bufs) {PRECALL;Con_Printf("glDrawBuffers(n, bufs)\n");POSTCALL;} -void wrapglDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) {PRECALL;glDrawElements(mode, count, type, indices);POSTCALL;} -//void wrapglDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) {PRECALL;glDrawRangeElements(mode, start, end, count, type, indices);POSTCALL;} -//void wrapglDrawRangeElementsEXT(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) {PRECALL;glDrawRangeElements(mode, start, end, count, type, indices);POSTCALL;} -void wrapglEnable(GLenum cap) {PRECALL;glEnable(cap);POSTCALL;} -void wrapglEnableVertexAttribArray(GLuint index) {PRECALL;glEnableVertexAttribArray(index);POSTCALL;} -//void wrapglEndQuery(GLenum target) {PRECALL;glEndQuery(target);POSTCALL;} -void wrapglFinish(void) {PRECALL;glFinish();POSTCALL;} -void wrapglFlush(void) {PRECALL;glFlush();POSTCALL;} -void wrapglFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) {PRECALL;glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);POSTCALL;} -void wrapglFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) {PRECALL;glFramebufferTexture2D(target, attachment, textarget, texture, level);POSTCALL;} -void wrapglFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) {PRECALL;Con_Printf("glFramebufferTexture3D()\n");POSTCALL;} -void wrapglGenBuffers(GLsizei n, GLuint *buffers) {PRECALL;glGenBuffers(n, buffers);POSTCALL;} -void wrapglGenFramebuffers(GLsizei n, GLuint *framebuffers) {PRECALL;glGenFramebuffers(n, framebuffers);POSTCALL;} -//void wrapglGenQueries(GLsizei n, GLuint *ids) {PRECALL;glGenQueries(n, ids);POSTCALL;} -void wrapglGenRenderbuffers(GLsizei n, GLuint *renderbuffers) {PRECALL;glGenRenderbuffers(n, renderbuffers);POSTCALL;} -void wrapglGenTextures(GLsizei n, GLuint *textures) {PRECALL;glGenTextures(n, textures);POSTCALL;} -void wrapglGenerateMipmap(GLenum target) {PRECALL;glGenerateMipmap(target);POSTCALL;} -void wrapglGetActiveAttrib(GLuint programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLchar *name) {PRECALL;glGetActiveAttrib(programObj, index, maxLength, length, size, type, name);POSTCALL;} -void wrapglGetActiveUniform(GLuint programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLchar *name) {PRECALL;glGetActiveUniform(programObj, index, maxLength, length, size, type, name);POSTCALL;} -void wrapglGetAttachedShaders(GLuint containerObj, GLsizei maxCount, GLsizei *count, GLuint *obj) {PRECALL;glGetAttachedShaders(containerObj, maxCount, count, obj);POSTCALL;} -void wrapglGetBooleanv(GLenum pname, GLboolean *params) {PRECALL;glGetBooleanv(pname, params);POSTCALL;} -void wrapglGetCompressedTexImage(GLenum target, GLint lod, void *img) {PRECALL;Con_Printf("glGetCompressedTexImage(target, lod, img)\n");POSTCALL;} -void wrapglGetDoublev(GLenum pname, GLdouble *params) {PRECALL;Con_Printf("glGetDoublev(pname, params)\n");POSTCALL;} -void wrapglGetFloatv(GLenum pname, GLfloat *params) {PRECALL;glGetFloatv(pname, params);POSTCALL;} -void wrapglGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params) {PRECALL;glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);POSTCALL;} -void wrapglGetShaderInfoLog(GLuint obj, GLsizei maxLength, GLsizei *length, GLchar *infoLog) {PRECALL;glGetShaderInfoLog(obj, maxLength, length, infoLog);POSTCALL;} -void wrapglGetProgramInfoLog(GLuint obj, GLsizei maxLength, GLsizei *length, GLchar *infoLog) {PRECALL;glGetProgramInfoLog(obj, maxLength, length, infoLog);POSTCALL;} -void wrapglGetIntegerv(GLenum pname, GLint *params) {PRECALL;glGetIntegerv(pname, params);POSTCALL;} -void wrapglGetShaderiv(GLuint obj, GLenum pname, GLint *params) {PRECALL;glGetShaderiv(obj, pname, params);POSTCALL;} -void wrapglGetProgramiv(GLuint obj, GLenum pname, GLint *params) {PRECALL;glGetProgramiv(obj, pname, params);POSTCALL;} -//void wrapglGetQueryObjectiv(GLuint qid, GLenum pname, GLint *params) {PRECALL;glGetQueryObjectiv(qid, pname, params);POSTCALL;} -//void wrapglGetQueryObjectuiv(GLuint qid, GLenum pname, GLuint *params) {PRECALL;glGetQueryObjectuiv(qid, pname, params);POSTCALL;} -//void wrapglGetQueryiv(GLenum target, GLenum pname, GLint *params) {PRECALL;glGetQueryiv(target, pname, params);POSTCALL;} -void wrapglGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) {PRECALL;glGetRenderbufferParameteriv(target, pname, params);POSTCALL;} -void wrapglGetShaderSource(GLuint obj, GLsizei maxLength, GLsizei *length, GLchar *source) {PRECALL;glGetShaderSource(obj, maxLength, length, source);POSTCALL;} -void wrapglGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels) {PRECALL;Con_Printf("glGetTexImage(target, level, format, type, pixels)\n");POSTCALL;} -void wrapglGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params) {PRECALL;Con_Printf("glGetTexLevelParameterfv(target, level, pname, params)\n");POSTCALL;} -void wrapglGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) {PRECALL;Con_Printf("glGetTexLevelParameteriv(target, level, pname, params)\n");POSTCALL;} -void wrapglGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) {PRECALL;glGetTexParameterfv(target, pname, params);POSTCALL;} -void wrapglGetTexParameteriv(GLenum target, GLenum pname, GLint *params) {PRECALL;glGetTexParameteriv(target, pname, params);POSTCALL;} -void wrapglGetUniformfv(GLuint programObj, GLint location, GLfloat *params) {PRECALL;glGetUniformfv(programObj, location, params);POSTCALL;} -void wrapglGetUniformiv(GLuint programObj, GLint location, GLint *params) {PRECALL;glGetUniformiv(programObj, location, params);POSTCALL;} -void wrapglHint(GLenum target, GLenum mode) {PRECALL;glHint(target, mode);POSTCALL;} -void wrapglLinkProgram(GLuint programObj) {PRECALL;glLinkProgram(programObj);POSTCALL;} -void wrapglPixelStorei(GLenum pname, GLint param) {PRECALL;glPixelStorei(pname, param);POSTCALL;} -void wrapglPointSize(GLfloat size) {PRECALL;Con_Printf("glPointSize(size)\n");POSTCALL;} -//void wrapglPolygonMode(GLenum face, GLenum mode) {PRECALL;Con_Printf("glPolygonMode(face, mode)\n");POSTCALL;} -void wrapglPolygonOffset(GLfloat factor, GLfloat units) {PRECALL;glPolygonOffset(factor, units);POSTCALL;} -void wrapglPolygonStipple(const GLubyte *mask) {PRECALL;Con_Printf("glPolygonStipple(mask)\n");POSTCALL;} -void wrapglReadBuffer(GLenum mode) {PRECALL;Con_Printf("glReadBuffer(mode)\n");POSTCALL;} -void wrapglReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) {PRECALL;glReadPixels(x, y, width, height, format, type, pixels);POSTCALL;} -void wrapglRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) {PRECALL;glRenderbufferStorage(target, internalformat, width, height);POSTCALL;} -void wrapglScissor(GLint x, GLint y, GLsizei width, GLsizei height) {PRECALL;glScissor(x, y, width, height);POSTCALL;} -void wrapglShaderSource(GLuint shaderObj, GLsizei count, const GLchar **string, const GLint *length) {PRECALL;glShaderSource(shaderObj, count, string, length);POSTCALL;} -void wrapglStencilFunc(GLenum func, GLint ref, GLuint mask) {PRECALL;glStencilFunc(func, ref, mask);POSTCALL;} -void wrapglStencilFuncSeparate(GLenum func1, GLenum func2, GLint ref, GLuint mask) {PRECALL;Con_Printf("glStencilFuncSeparate(func1, func2, ref, mask)\n");POSTCALL;} -void wrapglStencilMask(GLuint mask) {PRECALL;glStencilMask(mask);POSTCALL;} -void wrapglStencilOp(GLenum fail, GLenum zfail, GLenum zpass) {PRECALL;glStencilOp(fail, zfail, zpass);POSTCALL;} -void wrapglStencilOpSeparate(GLenum e1, GLenum e2, GLenum e3, GLenum e4) {PRECALL;Con_Printf("glStencilOpSeparate(e1, e2, e3, e4)\n");POSTCALL;} -void wrapglTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);POSTCALL;} -void wrapglTexImage3D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;Con_Printf("glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)\n");POSTCALL;} -void wrapglTexParameterf(GLenum target, GLenum pname, GLfloat param) {PRECALL;glTexParameterf(target, pname, param);POSTCALL;} -void wrapglTexParameterfv(GLenum target, GLenum pname, GLfloat *params) {PRECALL;glTexParameterfv(target, pname, params);POSTCALL;} -void wrapglTexParameteri(GLenum target, GLenum pname, GLint param) {PRECALL;glTexParameteri(target, pname, param);POSTCALL;} -void wrapglTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);POSTCALL;} -void wrapglTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels) {PRECALL;Con_Printf("glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)\n");POSTCALL;} -void wrapglUniform1f(GLint location, GLfloat v0) {PRECALL;glUniform1f(location, v0);POSTCALL;} -void wrapglUniform1fv(GLint location, GLsizei count, const GLfloat *value) {PRECALL;glUniform1fv(location, count, value);POSTCALL;} -void wrapglUniform1i(GLint location, GLint v0) {PRECALL;glUniform1i(location, v0);POSTCALL;} -void wrapglUniform1iv(GLint location, GLsizei count, const GLint *value) {PRECALL;glUniform1iv(location, count, value);POSTCALL;} -void wrapglUniform2f(GLint location, GLfloat v0, GLfloat v1) {PRECALL;glUniform2f(location, v0, v1);POSTCALL;} -void wrapglUniform2fv(GLint location, GLsizei count, const GLfloat *value) {PRECALL;glUniform2fv(location, count, value);POSTCALL;} -void wrapglUniform2i(GLint location, GLint v0, GLint v1) {PRECALL;glUniform2i(location, v0, v1);POSTCALL;} -void wrapglUniform2iv(GLint location, GLsizei count, const GLint *value) {PRECALL;glUniform2iv(location, count, value);POSTCALL;} -void wrapglUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) {PRECALL;glUniform3f(location, v0, v1, v2);POSTCALL;} -void wrapglUniform3fv(GLint location, GLsizei count, const GLfloat *value) {PRECALL;glUniform3fv(location, count, value);POSTCALL;} -void wrapglUniform3i(GLint location, GLint v0, GLint v1, GLint v2) {PRECALL;glUniform3i(location, v0, v1, v2);POSTCALL;} -void wrapglUniform3iv(GLint location, GLsizei count, const GLint *value) {PRECALL;glUniform3iv(location, count, value);POSTCALL;} -void wrapglUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) {PRECALL;glUniform4f(location, v0, v1, v2, v3);POSTCALL;} -void wrapglUniform4fv(GLint location, GLsizei count, const GLfloat *value) {PRECALL;glUniform4fv(location, count, value);POSTCALL;} -void wrapglUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) {PRECALL;glUniform4i(location, v0, v1, v2, v3);POSTCALL;} -void wrapglUniform4iv(GLint location, GLsizei count, const GLint *value) {PRECALL;glUniform4iv(location, count, value);POSTCALL;} -void wrapglUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) {PRECALL;glUniformMatrix2fv(location, count, transpose, value);POSTCALL;} -void wrapglUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) {PRECALL;glUniformMatrix3fv(location, count, transpose, value);POSTCALL;} -void wrapglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) {PRECALL;glUniformMatrix4fv(location, count, transpose, value);POSTCALL;} -void wrapglUseProgram(GLuint programObj) {PRECALL;glUseProgram(programObj);POSTCALL;} -void wrapglValidateProgram(GLuint programObj) {PRECALL;glValidateProgram(programObj);POSTCALL;} -void wrapglVertex2f(GLfloat x, GLfloat y) {PRECALL;Con_Printf("glVertex2f(x, y)\n");POSTCALL;} -void wrapglVertex3f(GLfloat x, GLfloat y, GLfloat z) {PRECALL;Con_Printf("glVertex3f(x, y, z)\n");POSTCALL;} -void wrapglVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) {PRECALL;Con_Printf("glVertex4f(x, y, z, w)\n");POSTCALL;} -void wrapglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) {PRECALL;glVertexAttribPointer(index, size, type, normalized, stride, pointer);POSTCALL;} -void wrapglVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) {PRECALL;Con_Printf("glVertexPointer(size, type, stride, ptr)\n");POSTCALL;} -void wrapglViewport(GLint x, GLint y, GLsizei width, GLsizei height) {PRECALL;glViewport(x, y, width, height);POSTCALL;} -void wrapglVertexAttrib1f(GLuint index, GLfloat v0) {PRECALL;glVertexAttrib1f(index, v0);POSTCALL;} -//void wrapglVertexAttrib1s(GLuint index, GLshort v0) {PRECALL;glVertexAttrib1s(index, v0);POSTCALL;} -//void wrapglVertexAttrib1d(GLuint index, GLdouble v0) {PRECALL;glVertexAttrib1d(index, v0);POSTCALL;} -void wrapglVertexAttrib2f(GLuint index, GLfloat v0, GLfloat v1) {PRECALL;glVertexAttrib2f(index, v0, v1);POSTCALL;} -//void wrapglVertexAttrib2s(GLuint index, GLshort v0, GLshort v1) {PRECALL;glVertexAttrib2s(index, v0, v1);POSTCALL;} -//void wrapglVertexAttrib2d(GLuint index, GLdouble v0, GLdouble v1) {PRECALL;glVertexAttrib2d(index, v0, v1);POSTCALL;} -void wrapglVertexAttrib3f(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2) {PRECALL;glVertexAttrib3f(index, v0, v1, v2);POSTCALL;} -//void wrapglVertexAttrib3s(GLuint index, GLshort v0, GLshort v1, GLshort v2) {PRECALL;glVertexAttrib3s(index, v0, v1, v2);POSTCALL;} -//void wrapglVertexAttrib3d(GLuint index, GLdouble v0, GLdouble v1, GLdouble v2) {PRECALL;glVertexAttrib3d(index, v0, v1, v2);POSTCALL;} -void wrapglVertexAttrib4f(GLuint index, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) {PRECALL;glVertexAttrib4f(index, v0, v1, v2, v3);POSTCALL;} -//void wrapglVertexAttrib4s(GLuint index, GLshort v0, GLshort v1, GLshort v2, GLshort v3) {PRECALL;glVertexAttrib4s(index, v0, v1, v2, v3);POSTCALL;} -//void wrapglVertexAttrib4d(GLuint index, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3) {PRECALL;glVertexAttrib4d(index, v0, v1, v2, v3);POSTCALL;} -//void wrapglVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) {PRECALL;glVertexAttrib4Nub(index, x, y, z, w);POSTCALL;} -void wrapglVertexAttrib1fv(GLuint index, const GLfloat *v) {PRECALL;glVertexAttrib1fv(index, v);POSTCALL;} -//void wrapglVertexAttrib1sv(GLuint index, const GLshort *v) {PRECALL;glVertexAttrib1sv(index, v);POSTCALL;} -//void wrapglVertexAttrib1dv(GLuint index, const GLdouble *v) {PRECALL;glVertexAttrib1dv(index, v);POSTCALL;} -void wrapglVertexAttrib2fv(GLuint index, const GLfloat *v) {PRECALL;glVertexAttrib2fv(index, v);POSTCALL;} -//void wrapglVertexAttrib2sv(GLuint index, const GLshort *v) {PRECALL;glVertexAttrib2sv(index, v);POSTCALL;} -//void wrapglVertexAttrib2dv(GLuint index, const GLdouble *v) {PRECALL;glVertexAttrib2dv(index, v);POSTCALL;} -void wrapglVertexAttrib3fv(GLuint index, const GLfloat *v) {PRECALL;glVertexAttrib3fv(index, v);POSTCALL;} -//void wrapglVertexAttrib3sv(GLuint index, const GLshort *v) {PRECALL;glVertexAttrib3sv(index, v);POSTCALL;} -//void wrapglVertexAttrib3dv(GLuint index, const GLdouble *v) {PRECALL;glVertexAttrib3dv(index, v);POSTCALL;} -void wrapglVertexAttrib4fv(GLuint index, const GLfloat *v) {PRECALL;glVertexAttrib4fv(index, v);POSTCALL;} -//void wrapglVertexAttrib4sv(GLuint index, const GLshort *v) {PRECALL;glVertexAttrib4sv(index, v);POSTCALL;} -//void wrapglVertexAttrib4dv(GLuint index, const GLdouble *v) {PRECALL;glVertexAttrib4dv(index, v);POSTCALL;} -//void wrapglVertexAttrib4iv(GLuint index, const GLint *v) {PRECALL;glVertexAttrib4iv(index, v);POSTCALL;} -//void wrapglVertexAttrib4bv(GLuint index, const GLbyte *v) {PRECALL;glVertexAttrib4bv(index, v);POSTCALL;} -//void wrapglVertexAttrib4ubv(GLuint index, const GLubyte *v) {PRECALL;glVertexAttrib4ubv(index, v);POSTCALL;} -//void wrapglVertexAttrib4usv(GLuint index, const GLushort *v) {PRECALL;glVertexAttrib4usv(index, GLushort v);POSTCALL;} -//void wrapglVertexAttrib4uiv(GLuint index, const GLuint *v) {PRECALL;glVertexAttrib4uiv(index, v);POSTCALL;} -//void wrapglVertexAttrib4Nbv(GLuint index, const GLbyte *v) {PRECALL;glVertexAttrib4Nbv(index, v);POSTCALL;} -//void wrapglVertexAttrib4Nsv(GLuint index, const GLshort *v) {PRECALL;glVertexAttrib4Nsv(index, v);POSTCALL;} -//void wrapglVertexAttrib4Niv(GLuint index, const GLint *v) {PRECALL;glVertexAttrib4Niv(index, v);POSTCALL;} -//void wrapglVertexAttrib4Nubv(GLuint index, const GLubyte *v) {PRECALL;glVertexAttrib4Nubv(index, v);POSTCALL;} -//void wrapglVertexAttrib4Nusv(GLuint index, const GLushort *v) {PRECALL;glVertexAttrib4Nusv(index, GLushort v);POSTCALL;} -//void wrapglVertexAttrib4Nuiv(GLuint index, const GLuint *v) {PRECALL;glVertexAttrib4Nuiv(index, v);POSTCALL;} -//void wrapglGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params) {PRECALL;glGetVertexAttribdv(index, pname, params);POSTCALL;} -void wrapglGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) {PRECALL;glGetVertexAttribfv(index, pname, params);POSTCALL;} -void wrapglGetVertexAttribiv(GLuint index, GLenum pname, GLint *params) {PRECALL;glGetVertexAttribiv(index, pname, params);POSTCALL;} -void wrapglGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer) {PRECALL;glGetVertexAttribPointerv(index, pname, pointer);POSTCALL;} -#endif - -void GLES_Init(void) -{ -#ifndef qglClear - qglIsBufferARB = wrapglIsBuffer; - qglIsEnabled = wrapglIsEnabled; - qglIsFramebufferEXT = wrapglIsFramebuffer; -// qglIsQueryARB = wrapglIsQuery; - qglIsRenderbufferEXT = wrapglIsRenderbuffer; -// qglUnmapBufferARB = wrapglUnmapBuffer; - qglCheckFramebufferStatus = wrapglCheckFramebufferStatus; - qglGetError = wrapglGetError; - qglCreateProgram = wrapglCreateProgram; - qglCreateShader = wrapglCreateShader; -// qglGetHandleARB = wrapglGetHandle; - qglGetAttribLocation = wrapglGetAttribLocation; - qglGetUniformLocation = wrapglGetUniformLocation; -// qglMapBufferARB = wrapglMapBuffer; - qglGetString = wrapglGetString; -// qglActiveStencilFaceEXT = wrapglActiveStencilFace; - qglActiveTexture = wrapglActiveTexture; - qglArrayElement = wrapglArrayElement; - qglAttachShader = wrapglAttachShader; -// qglBeginQueryARB = wrapglBeginQuery; - qglBindAttribLocation = wrapglBindAttribLocation; -// qglBindFragDataLocation = wrapglBindFragDataLocation; - qglBindBufferARB = wrapglBindBuffer; - qglBindFramebuffer = wrapglBindFramebuffer; - qglBindRenderbuffer = wrapglBindRenderbuffer; - qglBindTexture = wrapglBindTexture; - qglBlendEquationEXT = wrapglBlendEquation; - qglBlendFunc = wrapglBlendFunc; - qglBufferDataARB = wrapglBufferData; - qglBufferSubDataARB = wrapglBufferSubData; - qglClear = wrapglClear; - qglClearColor = wrapglClearColor; - qglClearDepth = wrapglClearDepth; - qglClearStencil = wrapglClearStencil; - qglColorMask = wrapglColorMask; - qglCompileShader = wrapglCompileShader; - qglCompressedTexImage2DARB = wrapglCompressedTexImage2D; - qglCompressedTexImage3DARB = wrapglCompressedTexImage3D; - qglCompressedTexSubImage2DARB = wrapglCompressedTexSubImage2D; - qglCompressedTexSubImage3DARB = wrapglCompressedTexSubImage3D; - qglCopyTexImage2D = wrapglCopyTexImage2D; - qglCopyTexSubImage2D = wrapglCopyTexSubImage2D; - qglCopyTexSubImage3D = wrapglCopyTexSubImage3D; - qglCullFace = wrapglCullFace; - qglDeleteBuffersARB = wrapglDeleteBuffers; - qglDeleteFramebuffers = wrapglDeleteFramebuffers; - qglDeleteProgram = wrapglDeleteProgram; - qglDeleteShader = wrapglDeleteShader; -// qglDeleteQueriesARB = wrapglDeleteQueries; - qglDeleteRenderbuffers = wrapglDeleteRenderbuffers; - qglDeleteTextures = wrapglDeleteTextures; - qglDepthFunc = wrapglDepthFunc; - qglDepthMask = wrapglDepthMask; - qglDepthRangef = wrapglDepthRangef; - qglDetachShader = wrapglDetachShader; - qglDisable = wrapglDisable; - qglDisableVertexAttribArray = wrapglDisableVertexAttribArray; - qglDrawArrays = wrapglDrawArrays; -// qglDrawBuffer = wrapglDrawBuffer; -// qglDrawBuffersARB = wrapglDrawBuffers; - qglDrawElements = wrapglDrawElements; -// qglDrawRangeElements = wrapglDrawRangeElements; - qglEnable = wrapglEnable; - qglEnableVertexAttribArray = wrapglEnableVertexAttribArray; -// qglEndQueryARB = wrapglEndQuery; - qglFinish = wrapglFinish; - qglFlush = wrapglFlush; - qglFramebufferRenderbufferEXT = wrapglFramebufferRenderbuffer; - qglFramebufferTexture2DEXT = wrapglFramebufferTexture2D; - qglFramebufferTexture3DEXT = wrapglFramebufferTexture3D; - qglGenBuffersARB = wrapglGenBuffers; - qglGenFramebuffers = wrapglGenFramebuffers; -// qglGenQueriesARB = wrapglGenQueries; - qglGenRenderbuffers = wrapglGenRenderbuffers; - qglGenTextures = wrapglGenTextures; - qglGenerateMipmapEXT = wrapglGenerateMipmap; - qglGetActiveAttrib = wrapglGetActiveAttrib; - qglGetActiveUniform = wrapglGetActiveUniform; - qglGetAttachedShaders = wrapglGetAttachedShaders; - qglGetBooleanv = wrapglGetBooleanv; -// qglGetCompressedTexImageARB = wrapglGetCompressedTexImage; - qglGetDoublev = wrapglGetDoublev; - qglGetFloatv = wrapglGetFloatv; - qglGetFramebufferAttachmentParameterivEXT = wrapglGetFramebufferAttachmentParameteriv; - qglGetProgramInfoLog = wrapglGetProgramInfoLog; - qglGetShaderInfoLog = wrapglGetShaderInfoLog; - qglGetIntegerv = wrapglGetIntegerv; - qglGetShaderiv = wrapglGetShaderiv; - qglGetProgramiv = wrapglGetProgramiv; -// qglGetQueryObjectivARB = wrapglGetQueryObjectiv; -// qglGetQueryObjectuivARB = wrapglGetQueryObjectuiv; -// qglGetQueryivARB = wrapglGetQueryiv; - qglGetRenderbufferParameterivEXT = wrapglGetRenderbufferParameteriv; - qglGetShaderSource = wrapglGetShaderSource; - qglGetTexImage = wrapglGetTexImage; - qglGetTexLevelParameterfv = wrapglGetTexLevelParameterfv; - qglGetTexLevelParameteriv = wrapglGetTexLevelParameteriv; - qglGetTexParameterfv = wrapglGetTexParameterfv; - qglGetTexParameteriv = wrapglGetTexParameteriv; - qglGetUniformfv = wrapglGetUniformfv; - qglGetUniformiv = wrapglGetUniformiv; - qglHint = wrapglHint; - qglLinkProgram = wrapglLinkProgram; - qglPixelStorei = wrapglPixelStorei; - qglPointSize = wrapglPointSize; -// qglPolygonMode = wrapglPolygonMode; - qglPolygonOffset = wrapglPolygonOffset; -// qglPolygonStipple = wrapglPolygonStipple; - qglReadBuffer = wrapglReadBuffer; - qglReadPixels = wrapglReadPixels; - qglRenderbufferStorage = wrapglRenderbufferStorage; - qglScissor = wrapglScissor; - qglShaderSource = wrapglShaderSource; - qglStencilFunc = wrapglStencilFunc; - qglStencilFuncSeparate = wrapglStencilFuncSeparate; - qglStencilMask = wrapglStencilMask; - qglStencilOp = wrapglStencilOp; - qglStencilOpSeparate = wrapglStencilOpSeparate; - qglTexImage2D = wrapglTexImage2D; - qglTexImage3D = wrapglTexImage3D; - qglTexParameterf = wrapglTexParameterf; - qglTexParameterfv = wrapglTexParameterfv; - qglTexParameteri = wrapglTexParameteri; - qglTexSubImage2D = wrapglTexSubImage2D; - qglTexSubImage3D = wrapglTexSubImage3D; - qglUniform1f = wrapglUniform1f; - qglUniform1fv = wrapglUniform1fv; - qglUniform1i = wrapglUniform1i; - qglUniform1iv = wrapglUniform1iv; - qglUniform2f = wrapglUniform2f; - qglUniform2fv = wrapglUniform2fv; - qglUniform2i = wrapglUniform2i; - qglUniform2iv = wrapglUniform2iv; - qglUniform3f = wrapglUniform3f; - qglUniform3fv = wrapglUniform3fv; - qglUniform3i = wrapglUniform3i; - qglUniform3iv = wrapglUniform3iv; - qglUniform4f = wrapglUniform4f; - qglUniform4fv = wrapglUniform4fv; - qglUniform4i = wrapglUniform4i; - qglUniform4iv = wrapglUniform4iv; - qglUniformMatrix2fv = wrapglUniformMatrix2fv; - qglUniformMatrix3fv = wrapglUniformMatrix3fv; - qglUniformMatrix4fv = wrapglUniformMatrix4fv; - qglUseProgram = wrapglUseProgram; - qglValidateProgram = wrapglValidateProgram; - qglVertex2f = wrapglVertex2f; - qglVertex3f = wrapglVertex3f; - qglVertex4f = wrapglVertex4f; - qglVertexAttribPointer = wrapglVertexAttribPointer; - qglVertexPointer = wrapglVertexPointer; - qglViewport = wrapglViewport; - qglVertexAttrib1f = wrapglVertexAttrib1f; -// qglVertexAttrib1s = wrapglVertexAttrib1s; -// qglVertexAttrib1d = wrapglVertexAttrib1d; - qglVertexAttrib2f = wrapglVertexAttrib2f; -// qglVertexAttrib2s = wrapglVertexAttrib2s; -// qglVertexAttrib2d = wrapglVertexAttrib2d; - qglVertexAttrib3f = wrapglVertexAttrib3f; -// qglVertexAttrib3s = wrapglVertexAttrib3s; -// qglVertexAttrib3d = wrapglVertexAttrib3d; - qglVertexAttrib4f = wrapglVertexAttrib4f; -// qglVertexAttrib4s = wrapglVertexAttrib4s; -// qglVertexAttrib4d = wrapglVertexAttrib4d; -// qglVertexAttrib4Nub = wrapglVertexAttrib4Nub; - qglVertexAttrib1fv = wrapglVertexAttrib1fv; -// qglVertexAttrib1sv = wrapglVertexAttrib1sv; -// qglVertexAttrib1dv = wrapglVertexAttrib1dv; - qglVertexAttrib2fv = wrapglVertexAttrib2fv; -// qglVertexAttrib2sv = wrapglVertexAttrib2sv; -// qglVertexAttrib2dv = wrapglVertexAttrib2dv; - qglVertexAttrib3fv = wrapglVertexAttrib3fv; -// qglVertexAttrib3sv = wrapglVertexAttrib3sv; -// qglVertexAttrib3dv = wrapglVertexAttrib3dv; - qglVertexAttrib4fv = wrapglVertexAttrib4fv; -// qglVertexAttrib4sv = wrapglVertexAttrib4sv; -// qglVertexAttrib4dv = wrapglVertexAttrib4dv; -// qglVertexAttrib4iv = wrapglVertexAttrib4iv; -// qglVertexAttrib4bv = wrapglVertexAttrib4bv; -// qglVertexAttrib4ubv = wrapglVertexAttrib4ubv; -// qglVertexAttrib4usv = wrapglVertexAttrib4usv; -// qglVertexAttrib4uiv = wrapglVertexAttrib4uiv; -// qglVertexAttrib4Nbv = wrapglVertexAttrib4Nbv; -// qglVertexAttrib4Nsv = wrapglVertexAttrib4Nsv; -// qglVertexAttrib4Niv = wrapglVertexAttrib4Niv; -// qglVertexAttrib4Nubv = wrapglVertexAttrib4Nubv; -// qglVertexAttrib4Nusv = wrapglVertexAttrib4Nusv; -// qglVertexAttrib4Nuiv = wrapglVertexAttrib4Nuiv; -// qglGetVertexAttribdv = wrapglGetVertexAttribdv; - qglGetVertexAttribfv = wrapglGetVertexAttribfv; - qglGetVertexAttribiv = wrapglGetVertexAttribiv; - qglGetVertexAttribPointerv = wrapglGetVertexAttribPointerv; -#endif - - gl_renderer = (const char *)qglGetString(GL_RENDERER); - gl_vendor = (const char *)qglGetString(GL_VENDOR); - gl_version = (const char *)qglGetString(GL_VERSION); - gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); - - if (!gl_extensions) - gl_extensions = ""; - if (!gl_platformextensions) - gl_platformextensions = ""; - - Con_Printf("GL_VENDOR: %s\n", gl_vendor); - Con_Printf("GL_RENDERER: %s\n", gl_renderer); - Con_Printf("GL_VERSION: %s\n", gl_version); - Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions); - Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions); - - // LordHavoc: report supported extensions - Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions ); - - // GLES devices in general do not like GL_BGRA, so use GL_RGBA - vid.forcetextype = TEXTYPE_RGBA; - - vid.support.gl20shaders = true; - vid.support.amd_texture_texture4 = false; - vid.support.arb_depth_texture = SDL_GL_ExtensionSupported("GL_OES_depth_texture") != 0; // renderbuffer used anyway on gles2? - vid.support.arb_draw_buffers = false; - vid.support.arb_multitexture = false; - vid.support.arb_occlusion_query = false; - vid.support.arb_query_buffer_object = false; - vid.support.arb_shadow = false; - vid.support.arb_texture_compression = false; // different (vendor-specific) formats than on desktop OpenGL... - vid.support.arb_texture_cube_map = SDL_GL_ExtensionSupported("GL_OES_texture_cube_map") != 0; - vid.support.arb_texture_env_combine = false; - vid.support.arb_texture_gather = false; - vid.support.arb_texture_non_power_of_two = strstr(gl_extensions, "GL_OES_texture_npot") != NULL; - vid.support.arb_vertex_buffer_object = true; // GLES2 core - vid.support.ext_blend_minmax = false; - vid.support.ext_blend_subtract = true; // GLES2 core - vid.support.ext_blend_func_separate = true; // GLES2 core - vid.support.ext_draw_range_elements = false; - - /* ELUAN: - Note: "In OS 2.1, the functions in GL_OES_framebuffer_object were not usable from the Java API. - Calling them just threw an exception. Android developer relations confirmed that they forgot to implement these. (yeah...) - It's apparently been fixed in 2.2, though I haven't tested." - */ - // LadyHavoc: Android 2.1 is way old now, enabling this again, it's going to be required soon. - vid.support.ext_framebuffer_object = true; - - vid.support.ext_packed_depth_stencil = false; - vid.support.ext_texture_3d = SDL_GL_ExtensionSupported("GL_OES_texture_3D") != 0; - vid.support.ext_texture_compression_s3tc = SDL_GL_ExtensionSupported("GL_EXT_texture_compression_s3tc") != 0; - vid.support.ext_texture_edge_clamp = true; // GLES2 core - vid.support.ext_texture_filter_anisotropic = false; // probably don't want to use it... - vid.support.ext_texture_srgb = false; - vid.support.arb_texture_float = SDL_GL_ExtensionSupported("GL_OES_texture_float") != 0; - vid.support.arb_half_float_pixel = SDL_GL_ExtensionSupported("GL_OES_texture_half_float") != 0; - vid.support.arb_half_float_vertex = SDL_GL_ExtensionSupported("GL_OES_vertex_half_float") != 0; - - // NOTE: On some devices, a value of 512 gives better FPS than the maximum. - qglGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_2d); - -#ifdef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT - if (vid.support.ext_texture_filter_anisotropic) - qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint*)&vid.max_anisotropy); -#endif - if (vid.support.arb_texture_cube_map) - qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_cubemap); -#ifdef GL_MAX_3D_TEXTURE_SIZE - if (vid.support.ext_texture_3d) - qglGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_3d); -#endif - Con_Printf("GL_MAX_CUBE_MAP_TEXTURE_SIZE = %i\n", vid.maxtexturesize_cubemap); - Con_Printf("GL_MAX_3D_TEXTURE_SIZE = %i\n", vid.maxtexturesize_3d); - { -#define GL_ALPHA_BITS 0x0D55 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 - int fb_r = -1, fb_g = -1, fb_b = -1, fb_a = -1, fb_d = -1, fb_s = -1; - qglGetIntegerv(GL_RED_BITS , &fb_r); - qglGetIntegerv(GL_GREEN_BITS , &fb_g); - qglGetIntegerv(GL_BLUE_BITS , &fb_b); - qglGetIntegerv(GL_ALPHA_BITS , &fb_a); - qglGetIntegerv(GL_DEPTH_BITS , &fb_d); - qglGetIntegerv(GL_STENCIL_BITS, &fb_s); - Con_Printf("Framebuffer depth is R%iG%iB%iA%iD%iS%i\n", fb_r, fb_g, fb_b, fb_a, fb_d, fb_s); - } - - // verify that cubemap textures are really supported - if (vid.support.arb_texture_cube_map && vid.maxtexturesize_cubemap < 256) - vid.support.arb_texture_cube_map = false; - - // verify that 3d textures are really supported - if (vid.support.ext_texture_3d && vid.maxtexturesize_3d < 32) - { - vid.support.ext_texture_3d = false; - Con_Printf("GL_OES_texture_3d reported bogus GL_MAX_3D_TEXTURE_SIZE, disabled\n"); - } - - vid.texunits = 4; - vid.teximageunits = 8; - vid.texarrayunits = 5; - //qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); - qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (GLint*)&vid.teximageunits);CHECKGLERROR - //qglGetIntegerv(GL_MAX_TEXTURE_COORDS, (GLint*)&vid.texarrayunits);CHECKGLERROR - vid.texunits = bound(1, vid.texunits, MAX_TEXTUREUNITS); - vid.teximageunits = bound(1, vid.teximageunits, MAX_TEXTUREUNITS); - vid.texarrayunits = bound(1, vid.texarrayunits, MAX_TEXTUREUNITS); - Con_DPrintf("Using GLES2.0 rendering path - %i texture matrix, %i texture images, %i texcoords%s\n", vid.texunits, vid.teximageunits, vid.texarrayunits, vid.support.ext_framebuffer_object ? ", shadowmapping supported" : ""); - vid.renderpath = RENDERPATH_GLES2; - vid.sRGBcapable2D = false; - vid.sRGBcapable3D = false; - - // VorteX: set other info (maybe place them in VID_InitMode?) - extern cvar_t gl_info_vendor; - extern cvar_t gl_info_renderer; - extern cvar_t gl_info_version; - extern cvar_t gl_info_platform; - extern cvar_t gl_info_driver; - Cvar_SetQuick(&gl_info_vendor, gl_vendor); - Cvar_SetQuick(&gl_info_renderer, gl_renderer); - Cvar_SetQuick(&gl_info_version, gl_version); - Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : ""); - Cvar_SetQuick(&gl_info_driver, gl_driver); -} -#endif - void *GL_GetProcAddress(const char *name) { void *p = NULL; @@ -1826,6 +1292,11 @@ void *GL_GetProcAddress(const char *name) return p; } +qboolean GL_ExtensionSupported(const char *name) +{ + return SDL_GL_ExtensionSupported(name); +} + static qboolean vid_sdl_initjoysticksystem = false; void VID_Init (void) @@ -1995,16 +1466,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) // hide the menu with SDL_WINDOW_BORDERLESS windowflags |= SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS; #endif -#ifndef USE_GLES2 - if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) - { - VID_Shutdown(); - Con_Print("Required OpenGL function glGetString not found\n"); - return false; - } -#endif - - // Knghtbrd: should do platform-specific extension string function here vid_isfullscreen = false; { @@ -2050,6 +1511,10 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) SDL_GL_SetAttribute (SDL_GL_CONTEXT_MAJOR_VERSION, 2); SDL_GL_SetAttribute (SDL_GL_CONTEXT_MINOR_VERSION, 0); SDL_GL_SetAttribute (SDL_GL_RETAINED_BACKING, 1); +#else + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, (gl_debug.integer > 0 ? SDL_GL_CONTEXT_DEBUG_FLAG : 0)); #endif video_bpp = mode->bitsperpixel; @@ -2074,14 +1539,31 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) vid_usingvsync = (vid_vsync.integer != 0); gl_platform = "SDL"; - gl_platformextensions = ""; -#ifdef USE_GLES2 - GLES_Init(); + GL_Setup(); + + // VorteX: set other info + extern cvar_t gl_info_vendor; + extern cvar_t gl_info_renderer; + extern cvar_t gl_info_version; + extern cvar_t gl_info_platform; + extern cvar_t gl_info_driver; + Cvar_SetQuick(&gl_info_vendor, gl_vendor); + Cvar_SetQuick(&gl_info_renderer, gl_renderer); + Cvar_SetQuick(&gl_info_version, gl_version); + Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : ""); + Cvar_SetQuick(&gl_info_driver, gl_driver); + + // LordHavoc: report supported extensions +#ifdef CONFIG_MENU + Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions); #else - GL_Init(); + Con_DPrintf("\nQuakeC extensions for server and client: %s\n", vm_sv_extensions); #endif + // clear to black (loading plaque will be seen over this) + GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 0); + vid_hidden = false; vid_activewindow = false; vid_hasfocus = true; @@ -2124,7 +1606,6 @@ void VID_Shutdown (void) gl_driver[0] = 0; gl_extensions = ""; gl_platform = ""; - gl_platformextensions = ""; } void VID_Finish (void) @@ -2138,7 +1619,7 @@ void VID_Finish (void) { switch(vid.renderpath) { - case RENDERPATH_GL20: + case RENDERPATH_GL32: case RENDERPATH_GLES2: CHECKGLERROR if (r_speeds.integer == 2 || gl_finish.integer)