X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=5770fb455e5e3517c2d5303befb1348f78aa496e;hb=a58e22c543943e280f18e58f49886a993d160310;hp=7d608d3f5f6127d742be05546bf5d2071c1a44a9;hpb=7842db054947d1818134fc9eefebd37516ab683a;p=xonotic%2Fdarkplaces.git diff --git a/gl_backend.c b/gl_backend.c index 7d608d3f..5770fb45 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -73,7 +73,6 @@ void SCR_ScreenShot_f (void); static matrix4x4_t backend_viewmatrix; static matrix4x4_t backend_modelmatrix; static matrix4x4_t backend_modelviewmatrix; -static matrix4x4_t backend_glmodelviewmatrix; static matrix4x4_t backend_projectmatrix; static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive; @@ -263,43 +262,25 @@ void GL_SetupView_Mode_Perspective (double frustumx, double frustumy, double zNe { double m[16]; - if (!r_render.integer) - return; - // set up viewpoint + CHECKGLERROR qglMatrixMode(GL_PROJECTION);CHECKGLERROR qglLoadIdentity();CHECKGLERROR // set view pyramid qglFrustum(-frustumx * zNear, frustumx * zNear, -frustumy * zNear, frustumy * zNear, zNear, zFar);CHECKGLERROR - qglGetDoublev(GL_PROJECTION_MATRIX, m); - backend_projectmatrix.m[0][0] = m[0]; - backend_projectmatrix.m[1][0] = m[1]; - backend_projectmatrix.m[2][0] = m[2]; - backend_projectmatrix.m[3][0] = m[3]; - backend_projectmatrix.m[0][1] = m[4]; - backend_projectmatrix.m[1][1] = m[5]; - backend_projectmatrix.m[2][1] = m[6]; - backend_projectmatrix.m[3][1] = m[7]; - backend_projectmatrix.m[0][2] = m[8]; - backend_projectmatrix.m[1][2] = m[9]; - backend_projectmatrix.m[2][2] = m[10]; - backend_projectmatrix.m[3][2] = m[11]; - backend_projectmatrix.m[0][3] = m[12]; - backend_projectmatrix.m[1][3] = m[13]; - backend_projectmatrix.m[2][3] = m[14]; - backend_projectmatrix.m[3][3] = m[15]; + qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR + Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m); qglMatrixMode(GL_MODELVIEW);CHECKGLERROR GL_SetupView_Orientation_Identity(); + CHECKGLERROR } void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double frustumx, double frustumy, double zNear) { double nudge, m[16]; - if (!r_render.integer) - return; - // set up viewpoint + CHECKGLERROR qglMatrixMode(GL_PROJECTION);CHECKGLERROR qglLoadIdentity();CHECKGLERROR // set view pyramid @@ -320,57 +301,27 @@ void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double frustumx, double frust m[13] = 0; m[14] = -2 * zNear * nudge; m[15] = 0; - qglLoadMatrixd(m); + qglLoadMatrixd(m);CHECKGLERROR qglMatrixMode(GL_MODELVIEW);CHECKGLERROR GL_SetupView_Orientation_Identity(); - backend_projectmatrix.m[0][0] = m[0]; - backend_projectmatrix.m[1][0] = m[1]; - backend_projectmatrix.m[2][0] = m[2]; - backend_projectmatrix.m[3][0] = m[3]; - backend_projectmatrix.m[0][1] = m[4]; - backend_projectmatrix.m[1][1] = m[5]; - backend_projectmatrix.m[2][1] = m[6]; - backend_projectmatrix.m[3][1] = m[7]; - backend_projectmatrix.m[0][2] = m[8]; - backend_projectmatrix.m[1][2] = m[9]; - backend_projectmatrix.m[2][2] = m[10]; - backend_projectmatrix.m[3][2] = m[11]; - backend_projectmatrix.m[0][3] = m[12]; - backend_projectmatrix.m[1][3] = m[13]; - backend_projectmatrix.m[2][3] = m[14]; - backend_projectmatrix.m[3][3] = m[15]; + CHECKGLERROR + Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m); } void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar) { double m[16]; - if (!r_render.integer) - return; - // set up viewpoint + CHECKGLERROR qglMatrixMode(GL_PROJECTION);CHECKGLERROR qglLoadIdentity();CHECKGLERROR - qglOrtho(x1, x2, y2, y1, zNear, zFar); - qglGetDoublev(GL_PROJECTION_MATRIX, m); - backend_projectmatrix.m[0][0] = m[0]; - backend_projectmatrix.m[1][0] = m[1]; - backend_projectmatrix.m[2][0] = m[2]; - backend_projectmatrix.m[3][0] = m[3]; - backend_projectmatrix.m[0][1] = m[4]; - backend_projectmatrix.m[1][1] = m[5]; - backend_projectmatrix.m[2][1] = m[6]; - backend_projectmatrix.m[3][1] = m[7]; - backend_projectmatrix.m[0][2] = m[8]; - backend_projectmatrix.m[1][2] = m[9]; - backend_projectmatrix.m[2][2] = m[10]; - backend_projectmatrix.m[3][2] = m[11]; - backend_projectmatrix.m[0][3] = m[12]; - backend_projectmatrix.m[1][3] = m[13]; - backend_projectmatrix.m[2][3] = m[14]; - backend_projectmatrix.m[3][3] = m[15]; + qglOrtho(x1, x2, y2, y1, zNear, zFar);CHECKGLERROR + qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR + Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m); qglMatrixMode(GL_MODELVIEW);CHECKGLERROR GL_SetupView_Orientation_Identity(); + CHECKGLERROR } typedef struct gltextureunit_s @@ -390,12 +341,15 @@ gltextureunit_t; static struct gl_state_s { + int cullface; + int cullfaceenable; int blendfunc1; int blendfunc2; int blend; GLboolean depthmask; int colormask; // stored as bottom 4 bits: r g b a (3 2 1 0 order) int depthtest; + int alphatest; int scissortest; unsigned int unit; unsigned int clientunit; @@ -468,9 +422,9 @@ void GL_SetupTextureState(void) { qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR } - qglMatrixMode(GL_TEXTURE); - qglLoadIdentity(); - qglMatrixMode(GL_MODELVIEW); + qglMatrixMode(GL_TEXTURE);CHECKGLERROR + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR if (gl_combine.integer) { qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR @@ -495,6 +449,7 @@ void GL_SetupTextureState(void) { qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR } + CHECKGLERROR } CHECKGLERROR } @@ -503,6 +458,7 @@ void GL_Backend_ResetState(void) { memset(&gl_state, 0, sizeof(gl_state)); gl_state.depthtest = true; + gl_state.alphatest = false; gl_state.blendfunc1 = GL_ONE; gl_state.blendfunc2 = GL_ZERO; gl_state.blend = false; @@ -513,15 +469,20 @@ void GL_Backend_ResetState(void) gl_state.lockrange_count = 0; gl_state.pointer_vertex = NULL; gl_state.pointer_color = NULL; + gl_state.cullface = GL_FRONT; // quake is backwards, this culls back faces + gl_state.cullfaceenable = true; CHECKGLERROR qglColorMask(1, 1, 1, 1); - qglEnable(GL_CULL_FACE);CHECKGLERROR - qglCullFace(GL_FRONT);CHECKGLERROR - qglEnable(GL_DEPTH_TEST);CHECKGLERROR + qglAlphaFunc(GL_GEQUAL, 0.5);CHECKGLERROR + qglDisable(GL_ALPHA_TEST);CHECKGLERROR qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR qglDisable(GL_BLEND);CHECKGLERROR + qglCullFace(gl_state.cullface);CHECKGLERROR + qglEnable(GL_CULL_FACE);CHECKGLERROR + qglDepthFunc(GL_LEQUAL);CHECKGLERROR + qglEnable(GL_DEPTH_TEST);CHECKGLERROR qglDepthMask(gl_state.depthmask);CHECKGLERROR qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), NULL);CHECKGLERROR @@ -543,6 +504,7 @@ void GL_ActiveTexture(unsigned int num) gl_state.unit = num; if (qglActiveTexture) { + CHECKGLERROR qglActiveTexture(GL_TEXTURE0_ARB + gl_state.unit); CHECKGLERROR } @@ -556,6 +518,7 @@ void GL_ClientActiveTexture(unsigned int num) gl_state.clientunit = num; if (qglActiveTexture) { + CHECKGLERROR qglClientActiveTexture(GL_TEXTURE0_ARB + gl_state.clientunit); CHECKGLERROR } @@ -566,6 +529,7 @@ void GL_BlendFunc(int blendfunc1, int blendfunc2) { if (gl_state.blendfunc1 != blendfunc1 || gl_state.blendfunc2 != blendfunc2) { + CHECKGLERROR qglBlendFunc(gl_state.blendfunc1 = blendfunc1, gl_state.blendfunc2 = blendfunc2);CHECKGLERROR if (gl_state.blendfunc2 == GL_ZERO) { @@ -601,6 +565,7 @@ void GL_DepthMask(int state) { if (gl_state.depthmask != state) { + CHECKGLERROR qglDepthMask(gl_state.depthmask = state);CHECKGLERROR } } @@ -610,6 +575,7 @@ void GL_DepthTest(int state) if (gl_state.depthtest != state) { gl_state.depthtest = state; + CHECKGLERROR if (gl_state.depthtest) { qglEnable(GL_DEPTH_TEST);CHECKGLERROR @@ -621,12 +587,59 @@ void GL_DepthTest(int state) } } +void GL_CullFace(int state) +{ + if (gl_state.cullface != state) + { + CHECKGLERROR + if (state != GL_NONE) + { + if (!gl_state.cullfaceenable) + { + gl_state.cullfaceenable = true; + qglEnable(GL_CULL_FACE);CHECKGLERROR + } + if (gl_state.cullface != state) + { + gl_state.cullface = state; + qglCullFace(state);CHECKGLERROR + } + } + else + { + if (gl_state.cullfaceenable) + { + gl_state.cullfaceenable = false; + qglDisable(GL_CULL_FACE);CHECKGLERROR + } + } + } +} + +void GL_AlphaTest(int state) +{ + if (gl_state.alphatest != state) + { + gl_state.alphatest = state; + CHECKGLERROR + if (gl_state.alphatest) + { + qglEnable(GL_ALPHA_TEST);CHECKGLERROR + } + else + { + qglDisable(GL_ALPHA_TEST);CHECKGLERROR + } + } +} + void GL_ColorMask(int r, int g, int b, int a) { int state = r*8 + g*4 + b*2 + a*1; if (gl_state.colormask != state) { gl_state.colormask = state; + CHECKGLERROR qglColorMask((GLboolean)r, (GLboolean)g, (GLboolean)b, (GLboolean)a);CHECKGLERROR } } @@ -689,6 +702,7 @@ void GL_ScissorTest(int state) void GL_Clear(int mask) { + CHECKGLERROR qglClear(mask);CHECKGLERROR } @@ -699,9 +713,9 @@ void GL_TransformToScreen(const vec4_t in, vec4_t out) Matrix4x4_Transform4 (&backend_viewmatrix, in, temp); Matrix4x4_Transform4 (&backend_projectmatrix, temp, out); iw = 1.0f / out[3]; - out[0] = r_view_x + (out[0] * iw + 1.0f) * r_view_width * 0.5f; - out[1] = r_view_y + (out[1] * iw + 1.0f) * r_view_height * 0.5f; - out[2] = r_view_z + (out[2] * iw + 1.0f) * r_view_depth * 0.5f; + out[0] = r_view.x + (out[0] * iw + 1.0f) * r_view.width * 0.5f; + out[1] = r_view.y + r_view.height - (out[1] * iw + 1.0f) * r_view.height * 0.5f; + out[2] = r_view.z + (out[2] * iw + 1.0f) * r_view.depth * 0.5f; } // called at beginning of frame @@ -709,6 +723,11 @@ void R_Mesh_Start(void) { BACKENDACTIVECHECK CHECKGLERROR + if (gl_printcheckerror.integer && !gl_paranoid.integer) + { + Con_Printf("WARNING: gl_printcheckerror is on but gl_paranoid is off, turning it on...\n"); + Cvar_SetValueQuick(&gl_paranoid, 1); + } GL_Backend_ResetState(); } @@ -719,8 +738,7 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver char compilelog[MAX_INPUTLINE]; CHECKGLERROR - programobject = qglCreateProgramObjectARB(); - CHECKGLERROR + programobject = qglCreateProgramObjectARB();CHECKGLERROR if (!programobject) return 0; @@ -746,66 +764,56 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver if (vertexstrings_count) { - CHECKGLERROR - vertexshaderobject = qglCreateShaderObjectARB(GL_VERTEX_SHADER_ARB); + vertexshaderobject = qglCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);CHECKGLERROR if (!vertexshaderobject) { qglDeleteObjectARB(programobject); CHECKGLERROR return 0; } - qglShaderSourceARB(vertexshaderobject, vertexstrings_count, vertexstrings_list, NULL); - qglCompileShaderARB(vertexshaderobject); - CHECKGLERROR - qglGetObjectParameterivARB(vertexshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &vertexshadercompiled); - qglGetInfoLogARB(vertexshaderobject, sizeof(compilelog), NULL, compilelog); + qglShaderSourceARB(vertexshaderobject, vertexstrings_count, vertexstrings_list, NULL);CHECKGLERROR + qglCompileShaderARB(vertexshaderobject);CHECKGLERROR + qglGetObjectParameterivARB(vertexshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &vertexshadercompiled);CHECKGLERROR + qglGetInfoLogARB(vertexshaderobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR if (compilelog[0]) Con_DPrintf("vertex shader compile log:\n%s\n", compilelog); if (!vertexshadercompiled) { - qglDeleteObjectARB(programobject); - qglDeleteObjectARB(vertexshaderobject); - CHECKGLERROR + qglDeleteObjectARB(programobject);CHECKGLERROR + qglDeleteObjectARB(vertexshaderobject);CHECKGLERROR return 0; } - qglAttachObjectARB(programobject, vertexshaderobject); - qglDeleteObjectARB(vertexshaderobject); - CHECKGLERROR + qglAttachObjectARB(programobject, vertexshaderobject);CHECKGLERROR + qglDeleteObjectARB(vertexshaderobject);CHECKGLERROR } if (fragmentstrings_count) { - CHECKGLERROR - fragmentshaderobject = qglCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB); + fragmentshaderobject = qglCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);CHECKGLERROR if (!fragmentshaderobject) { - qglDeleteObjectARB(programobject); - CHECKGLERROR + qglDeleteObjectARB(programobject);CHECKGLERROR return 0; } - qglShaderSourceARB(fragmentshaderobject, fragmentstrings_count, fragmentstrings_list, NULL); - qglCompileShaderARB(fragmentshaderobject); - CHECKGLERROR - qglGetObjectParameterivARB(fragmentshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &fragmentshadercompiled); - qglGetInfoLogARB(fragmentshaderobject, sizeof(compilelog), NULL, compilelog); + qglShaderSourceARB(fragmentshaderobject, fragmentstrings_count, fragmentstrings_list, NULL);CHECKGLERROR + qglCompileShaderARB(fragmentshaderobject);CHECKGLERROR + qglGetObjectParameterivARB(fragmentshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &fragmentshadercompiled);CHECKGLERROR + qglGetInfoLogARB(fragmentshaderobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR if (compilelog[0]) Con_DPrintf("fragment shader compile log:\n%s\n", compilelog); if (!fragmentshadercompiled) { - qglDeleteObjectARB(programobject); - qglDeleteObjectARB(fragmentshaderobject); - CHECKGLERROR + qglDeleteObjectARB(programobject);CHECKGLERROR + qglDeleteObjectARB(fragmentshaderobject);CHECKGLERROR return 0; } - qglAttachObjectARB(programobject, fragmentshaderobject); - qglDeleteObjectARB(fragmentshaderobject); - CHECKGLERROR + qglAttachObjectARB(programobject, fragmentshaderobject);CHECKGLERROR + qglDeleteObjectARB(fragmentshaderobject);CHECKGLERROR } - qglLinkProgramARB(programobject); - CHECKGLERROR - qglGetObjectParameterivARB(programobject, GL_OBJECT_LINK_STATUS_ARB, &programlinked); - qglGetInfoLogARB(programobject, sizeof(compilelog), NULL, compilelog); + qglLinkProgramARB(programobject);CHECKGLERROR + qglGetObjectParameterivARB(programobject, GL_OBJECT_LINK_STATUS_ARB, &programlinked);CHECKGLERROR + qglGetInfoLogARB(programobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR if (compilelog[0]) { Con_DPrintf("program link log:\n%s\n", compilelog); @@ -818,10 +826,9 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver if (strstr(compilelog, "fragment shader will run in software")) programlinked = false; } - CHECKGLERROR if (!programlinked) { - qglDeleteObjectARB(programobject); + qglDeleteObjectARB(programobject);CHECKGLERROR return 0; } CHECKGLERROR @@ -859,21 +866,23 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * Con_Printf("R_Mesh_Draw(%d, %d, %d, %08p);\n", firstvertex, numvertices, numtriangles, elements); return; } - //CHECKGLERROR - renderstats.meshes++; - renderstats.meshes_elements += numelements; + CHECKGLERROR + r_refdef.stats.meshes++; + r_refdef.stats.meshes_elements += numelements; if (gl_paranoid.integer) { unsigned int i, j, size; const int *p; if (!qglIsEnabled(GL_VERTEX_ARRAY)) Con_Print("R_Mesh_Draw: vertex array not enabled\n"); + CHECKGLERROR for (j = 0, size = numvertices * 3, p = (int *)((float *)gl_state.pointer_vertex + firstvertex * 3);j < size;j++, p++) paranoidblah += *p; if (gl_state.pointer_color) { if (!qglIsEnabled(GL_COLOR_ARRAY)) Con_Print("R_Mesh_Draw: color array set but not enabled\n"); + CHECKGLERROR for (j = 0, size = numvertices * 4, p = (int *)((float *)gl_state.pointer_color + firstvertex * 4);j < size;j++, p++) paranoidblah += *p; } @@ -884,6 +893,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * GL_ClientActiveTexture(i); if (!qglIsEnabled(GL_TEXTURE_COORD_ARRAY)) Con_Print("R_Mesh_Draw: texcoord array set but not enabled\n"); + CHECKGLERROR for (j = 0, size = numvertices * gl_state.units[i].arraycomponents, p = (int *)((float *)gl_state.units[i].pointer_texcoord + firstvertex * gl_state.units[i].arraycomponents);j < size;j++, p++) paranoidblah += *p; } @@ -1056,10 +1066,12 @@ void R_Mesh_Matrix(const matrix4x4_t *matrix) { if (memcmp(matrix, &backend_modelmatrix, sizeof(matrix4x4_t))) { + double glmatrix[16]; backend_modelmatrix = *matrix; Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewmatrix, matrix); - Matrix4x4_Transpose(&backend_glmodelviewmatrix, &backend_modelviewmatrix); - qglLoadMatrixf(&backend_glmodelviewmatrix.m[0][0]); + Matrix4x4_ToArrayDoubleGL(&backend_modelviewmatrix, glmatrix); + CHECKGLERROR + qglLoadMatrixd(glmatrix);CHECKGLERROR } } @@ -1081,20 +1093,16 @@ void R_Mesh_ColorPointer(const float *color4f) CHECKGLERROR if (!gl_state.pointer_color) { - qglEnableClientState(GL_COLOR_ARRAY); - CHECKGLERROR + qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR } else if (!color4f) { - qglDisableClientState(GL_COLOR_ARRAY); - CHECKGLERROR + qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR // when color array is on the glColor gets trashed, set it again - qglColor4f(gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]); - CHECKGLERROR + qglColor4f(gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]);CHECKGLERROR } gl_state.pointer_color = color4f; - qglColorPointer(4, GL_FLOAT, sizeof(float[4]), gl_state.pointer_color); - CHECKGLERROR + qglColorPointer(4, GL_FLOAT, sizeof(float[4]), gl_state.pointer_color);CHECKGLERROR } } @@ -1102,6 +1110,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co { gltextureunit_t *unit = gl_state.units + unitnum; // update array settings + CHECKGLERROR if (texcoord) { // texcoord array @@ -1110,8 +1119,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co unit->pointer_texcoord = texcoord; unit->arraycomponents = numcomponents; GL_ClientActiveTexture(unitnum); - qglTexCoordPointer(unit->arraycomponents, GL_FLOAT, sizeof(float) * unit->arraycomponents, unit->pointer_texcoord); - CHECKGLERROR + qglTexCoordPointer(unit->arraycomponents, GL_FLOAT, sizeof(float) * unit->arraycomponents, unit->pointer_texcoord);CHECKGLERROR } // texture array unit is enabled, enable the array if (!unit->arrayenabled) @@ -1147,17 +1155,20 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (tex1d) { if (unit->t1d == 0) - qglEnable(GL_TEXTURE_1D); + { + qglEnable(GL_TEXTURE_1D);CHECKGLERROR + } } else { if (unit->t1d) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } } } unit->t1d = tex1d; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d != tex2d) @@ -1168,17 +1179,20 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (tex2d) { if (unit->t2d == 0) - qglEnable(GL_TEXTURE_2D); + { + qglEnable(GL_TEXTURE_2D);CHECKGLERROR + } } else { if (unit->t2d) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } } } unit->t2d = tex2d; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d != tex3d) @@ -1189,17 +1203,20 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (tex3d) { if (unit->t3d == 0) - qglEnable(GL_TEXTURE_3D); + { + qglEnable(GL_TEXTURE_3D);CHECKGLERROR + } } else { if (unit->t3d) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } } } unit->t3d = tex3d; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap != texcubemap) @@ -1210,17 +1227,20 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (texcubemap) { if (unit->tcubemap == 0) - qglEnable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } else { if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } } unit->tcubemap = texcubemap; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } @@ -1238,17 +1258,20 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) if (texnum) { if (unit->t1d == 0) - qglEnable(GL_TEXTURE_1D); + { + qglEnable(GL_TEXTURE_1D);CHECKGLERROR + } } else { if (unit->t1d) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } } } unit->t1d = texnum; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d) @@ -1257,11 +1280,12 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t2d) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } } unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d) @@ -1270,11 +1294,12 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t3d) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } } unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap) @@ -1283,11 +1308,12 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } @@ -1303,11 +1329,12 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t1d) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } } unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d != texnum) @@ -1318,17 +1345,20 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (texnum) { if (unit->t2d == 0) - qglEnable(GL_TEXTURE_2D); + { + qglEnable(GL_TEXTURE_2D);CHECKGLERROR + } } else { if (unit->t2d) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } } } unit->t2d = texnum; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d) @@ -1337,11 +1367,12 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t3d) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } } unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap != 0) @@ -1350,11 +1381,12 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } @@ -1370,11 +1402,12 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t1d) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } } unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d) @@ -1383,11 +1416,12 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t2d) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } } unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d != texnum) @@ -1398,17 +1432,20 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) if (texnum) { if (unit->t3d == 0) - qglEnable(GL_TEXTURE_3D); + { + qglEnable(GL_TEXTURE_3D);CHECKGLERROR + } } else { if (unit->t3d) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } } } unit->t3d = texnum; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap != 0) @@ -1417,11 +1454,12 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } @@ -1437,11 +1475,12 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t1d) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } } unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d) @@ -1450,11 +1489,12 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t2d) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } } unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d) @@ -1463,11 +1503,12 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) if (unitnum < backendunits) { if (unit->t3d) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } } unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap != texnum) @@ -1478,17 +1519,20 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) if (texnum) { if (unit->tcubemap == 0) - qglEnable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } else { if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } } } unit->tcubemap = texnum; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } @@ -1500,14 +1544,15 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix) // texmatrix specified, check if it is different if (!unit->texmatrixenabled || memcmp(&unit->matrix, matrix, sizeof(matrix4x4_t))) { - matrix4x4_t tempmatrix; + double glmatrix[16]; unit->texmatrixenabled = true; unit->matrix = *matrix; - Matrix4x4_Transpose(&tempmatrix, &unit->matrix); - qglMatrixMode(GL_TEXTURE); + CHECKGLERROR + Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix); + qglMatrixMode(GL_TEXTURE);CHECKGLERROR GL_ActiveTexture(unitnum); - qglLoadMatrixf(&tempmatrix.m[0][0]); - qglMatrixMode(GL_MODELVIEW); + qglLoadMatrixd(glmatrix);CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR } } else @@ -1516,10 +1561,11 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix) if (unit->texmatrixenabled) { unit->texmatrixenabled = false; - qglMatrixMode(GL_TEXTURE); + CHECKGLERROR + qglMatrixMode(GL_TEXTURE);CHECKGLERROR GL_ActiveTexture(unitnum); - qglLoadIdentity(); - qglMatrixMode(GL_MODELVIEW); + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR } } } @@ -1527,6 +1573,7 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix) void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, int rgbscale, int alphascale) { gltextureunit_t *unit = gl_state.units + unitnum; + CHECKGLERROR if (gl_combine.integer) { // GL_ARB_texture_env_combine @@ -1581,10 +1628,12 @@ void R_Mesh_TextureState(const rmeshstate_t *m) BACKENDACTIVECHECK + CHECKGLERROR if (gl_backend_rebindtextures) { gl_backend_rebindtextures = false; GL_SetupTextureState(); + CHECKGLERROR } for (i = 0;i < backendimageunits;i++) @@ -1601,6 +1650,7 @@ void R_Mesh_TextureState(const rmeshstate_t *m) R_Mesh_TexMatrix(i, &m->texmatrix[i]); R_Mesh_TexCombine(i, m->texcombinergb[i], m->texcombinealpha[i], m->texrgbscale[i], m->texalphascale[i]); } + CHECKGLERROR } void R_Mesh_ResetTextureState(void) @@ -1609,10 +1659,12 @@ void R_Mesh_ResetTextureState(void) BACKENDACTIVECHECK + CHECKGLERROR if (gl_backend_rebindtextures) { gl_backend_rebindtextures = false; GL_SetupTextureState(); + CHECKGLERROR } for (unitnum = 0;unitnum < backendimageunits;unitnum++) @@ -1623,40 +1675,44 @@ void R_Mesh_ResetTextureState(void) { GL_ActiveTexture(unitnum); if (unitnum < backendunits) - qglDisable(GL_TEXTURE_1D); + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } // update 2d texture binding if (unit->t2d) { GL_ActiveTexture(unitnum); if (unitnum < backendunits) - qglDisable(GL_TEXTURE_2D); + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } // update 3d texture binding if (unit->t3d) { GL_ActiveTexture(unitnum); if (unitnum < backendunits) - qglDisable(GL_TEXTURE_3D); + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } // update cubemap texture binding if (unit->tcubemap) { GL_ActiveTexture(unitnum); if (unitnum < backendunits) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB); + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap); - CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } for (unitnum = 0;unitnum < backendarrayunits;unitnum++) @@ -1677,10 +1733,11 @@ void R_Mesh_ResetTextureState(void) if (unit->texmatrixenabled) { unit->texmatrixenabled = false; - qglMatrixMode(GL_TEXTURE); + CHECKGLERROR + qglMatrixMode(GL_TEXTURE);CHECKGLERROR GL_ActiveTexture(unitnum); - qglLoadIdentity(); - qglMatrixMode(GL_MODELVIEW); + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR } if (gl_combine.integer) { @@ -1723,6 +1780,7 @@ void R_Mesh_ResetTextureState(void) void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements) { + CHECKGLERROR qglBegin(GL_LINES); for (;numtriangles;numtriangles--, elements += 3) {