X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=5770fb455e5e3517c2d5303befb1348f78aa496e;hb=a58e22c543943e280f18e58f49886a993d160310;hp=0b7121d7d573c9c6c085290b0d108863ed307308;hpb=d9919887fed8a056fb3437562d649baf8ced2297;p=xonotic%2Fdarkplaces.git diff --git a/gl_backend.c b/gl_backend.c index 0b7121d7..5770fb45 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1,7 +1,5 @@ #include "quakedef.h" -#include "image.h" -#include "jpeg.h" #include "cl_collision.h" cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1", "use glDrawRangeElements function if available instead of glDrawElements (for performance comparisons or bug testing)"}; @@ -9,11 +7,6 @@ cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0", "use glBe cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0", "use glBegin(GL_TRIANGLES);glTexCoord2f();glVertex3f();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"}; cvar_t gl_paranoid = {0, "gl_paranoid", "0", "enables OpenGL error checking and other tests"}; cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0", "prints all OpenGL error checks, useful to identify location of driver crashes"}; -cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation of eyes in the world (try negative values too)"}; -cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views (for those who can't afford glasses but can afford eye strain)"}; -cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"}; -cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"}; -cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"}; cvar_t r_render = {0, "r_render", "1", "enables rendering calls (you want this on!)"}; cvar_t r_waterwarp = {CVAR_SAVE, "r_waterwarp", "1", "warp view while underwater"}; @@ -80,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; @@ -139,18 +131,15 @@ for (y = 0;y < rows - 1;y++) } */ -int polygonelements[768]; +int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3]; +int quadelements[QUADELEMENTS_MAXQUADS*6]; -static void R_Mesh_CacheArray_Startup(void); -static void R_Mesh_CacheArray_Shutdown(void); void GL_Backend_AllocArrays(void) { - R_Mesh_CacheArray_Startup(); } void GL_Backend_FreeArrays(void) { - R_Mesh_CacheArray_Shutdown(); } static void gl_backend_start(void) @@ -210,11 +199,6 @@ static void gl_backend_newmap(void) { } -cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0", "displays a zoomed in overlay window"}; -cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20", "horizontal viewsize of zoom window"}; -cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", "vertical viewsize of zoom window"}; -cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"}; - void gl_backend_init(void) { int i; @@ -225,14 +209,19 @@ void gl_backend_init(void) polygonelements[i * 3 + 1] = i + 1; polygonelements[i * 3 + 2] = i + 2; } + // elements for rendering a series of quads as triangles + for (i = 0;i < QUADELEMENTS_MAXQUADS;i++) + { + quadelements[i * 6 + 0] = i * 4; + quadelements[i * 6 + 1] = i * 4 + 1; + quadelements[i * 6 + 2] = i * 4 + 2; + quadelements[i * 6 + 3] = i * 4; + quadelements[i * 6 + 4] = i * 4 + 2; + quadelements[i * 6 + 5] = i * 4 + 3; + } Cvar_RegisterVariable(&r_render); Cvar_RegisterVariable(&r_waterwarp); - Cvar_RegisterVariable(&r_stereo_separation); - Cvar_RegisterVariable(&r_stereo_sidebyside); - Cvar_RegisterVariable(&r_stereo_redblue); - Cvar_RegisterVariable(&r_stereo_redcyan); - Cvar_RegisterVariable(&r_stereo_redgreen); Cvar_RegisterVariable(&gl_polyblend); Cvar_RegisterVariable(&gl_dither); Cvar_RegisterVariable(&gl_lockarrays); @@ -246,11 +235,6 @@ void gl_backend_init(void) Cvar_RegisterVariable(&gl_mesh_testarrayelement); Cvar_RegisterVariable(&gl_mesh_testmanualfeeding); - Cvar_RegisterVariable(&scr_zoomwindow); - Cvar_RegisterVariable(&scr_zoomwindow_viewsizex); - Cvar_RegisterVariable(&scr_zoomwindow_viewsizey); - Cvar_RegisterVariable(&scr_zoomwindow_fov); - R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap); } @@ -278,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 @@ -335,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 @@ -394,7 +330,7 @@ typedef struct gltextureunit_s int arrayenabled; unsigned int arraycomponents; const void *pointer_texcoord; - float rgbscale, alphascale; + int rgbscale, alphascale; int combinergb, combinealpha; // FIXME: add more combine stuff // texmatrixenabled exists only to avoid unnecessary texmatrix compares @@ -405,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; @@ -483,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 @@ -510,6 +449,7 @@ void GL_SetupTextureState(void) { qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR } + CHECKGLERROR } CHECKGLERROR } @@ -518,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; @@ -528,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 @@ -558,6 +504,7 @@ void GL_ActiveTexture(unsigned int num) gl_state.unit = num; if (qglActiveTexture) { + CHECKGLERROR qglActiveTexture(GL_TEXTURE0_ARB + gl_state.unit); CHECKGLERROR } @@ -571,6 +518,7 @@ void GL_ClientActiveTexture(unsigned int num) gl_state.clientunit = num; if (qglActiveTexture) { + CHECKGLERROR qglClientActiveTexture(GL_TEXTURE0_ARB + gl_state.clientunit); CHECKGLERROR } @@ -581,8 +529,7 @@ void GL_BlendFunc(int blendfunc1, int blendfunc2) { if (gl_state.blendfunc1 != blendfunc1 || gl_state.blendfunc2 != blendfunc2) { - if (r_showtrispass) - return; + CHECKGLERROR qglBlendFunc(gl_state.blendfunc1 = blendfunc1, gl_state.blendfunc2 = blendfunc2);CHECKGLERROR if (gl_state.blendfunc2 == GL_ZERO) { @@ -618,8 +565,7 @@ void GL_DepthMask(int state) { if (gl_state.depthmask != state) { - if (r_showtrispass) - return; + CHECKGLERROR qglDepthMask(gl_state.depthmask = state);CHECKGLERROR } } @@ -628,9 +574,8 @@ void GL_DepthTest(int state) { if (gl_state.depthtest != state) { - if (r_showtrispass && r_showdisabledepthtest.integer) - return; gl_state.depthtest = state; + CHECKGLERROR if (gl_state.depthtest) { qglEnable(GL_DEPTH_TEST);CHECKGLERROR @@ -642,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 } } @@ -656,8 +648,6 @@ void GL_Color(float cr, float cg, float cb, float ca) { if (gl_state.pointer_color || gl_state.color4f[0] != cr || gl_state.color4f[1] != cg || gl_state.color4f[2] != cb || gl_state.color4f[3] != ca) { - if (r_showtrispass) - return; gl_state.color4f[0] = cr; gl_state.color4f[1] = cg; gl_state.color4f[2] = cb; @@ -668,16 +658,6 @@ void GL_Color(float cr, float cg, float cb, float ca) } } -void GL_ShowTrisColor(float cr, float cg, float cb, float ca) -{ - if (!r_showtrispass) - return; - r_showtrispass = 0; - GL_Color(cr * r_showtris.value, cg * r_showtris.value, cb * r_showtris.value, ca); - r_showtrispass = 1; -} - - void GL_LockArrays(int first, int count) { if (gl_state.lockrange_count != count || gl_state.lockrange_first != first) @@ -722,10 +702,7 @@ void GL_ScissorTest(int state) void GL_Clear(int mask) { - // in showtris rendering, don't clear the color buffer as that would hide - // the accumulated lines - if (r_showtrispass) - mask &= ~GL_COLOR_BUFFER_BIT; + CHECKGLERROR qglClear(mask);CHECKGLERROR } @@ -736,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 @@ -746,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(); } @@ -756,73 +738,82 @@ 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; + if (developer.integer >= 100) + { + int i; + Con_Printf("Compiling shader:\n"); + if (vertexstrings_count) + { + Con_Printf("------ VERTEX SHADER ------\n"); + for (i = 0;i < vertexstrings_count;i++) + Con_Print(vertexstrings_list[i]); + Con_Print("\n"); + } + if (fragmentstrings_count) + { + Con_Printf("------ FRAGMENT SHADER ------\n"); + for (i = 0;i < fragmentstrings_count;i++) + Con_Print(fragmentstrings_list[i]); + Con_Print("\n"); + } + } + 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); @@ -835,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 @@ -876,26 +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 - if (r_showtrispass) - { - R_Mesh_Draw_ShowTris(firstvertex, numvertices, numtriangles, elements); - return; - } - 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; } @@ -906,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; } @@ -1078,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 } } @@ -1098,36 +1088,29 @@ void R_Mesh_VertexPointer(const float *vertex3f) void R_Mesh_ColorPointer(const float *color4f) { - if (r_showtrispass) - return; if (gl_state.pointer_color != 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 } } void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord) { gltextureunit_t *unit = gl_state.units + unitnum; - if (r_showtrispass) - return; // update array settings + CHECKGLERROR if (texcoord) { // texcoord array @@ -1136,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) @@ -1164,8 +1146,6 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in gltextureunit_t *unit = gl_state.units + unitnum; if (unitnum >= backendimageunits) return; - if (r_showtrispass) - return; // update 1d texture binding if (unit->t1d != tex1d) { @@ -1175,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) @@ -1196,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) @@ -1217,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) @@ -1238,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 } } @@ -1257,8 +1249,6 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) gltextureunit_t *unit = gl_state.units + unitnum; if (unitnum >= backendimageunits) return; - if (r_showtrispass) - return; // update 1d texture binding if (unit->t1d != texnum) { @@ -1268,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) @@ -1287,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) @@ -1300,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) @@ -1313,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 } } @@ -1326,8 +1322,6 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) gltextureunit_t *unit = gl_state.units + unitnum; if (unitnum >= backendimageunits) return; - if (r_showtrispass) - return; // update 1d texture binding if (unit->t1d) { @@ -1335,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) @@ -1350,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) @@ -1369,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) @@ -1382,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 } } @@ -1395,8 +1395,6 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) gltextureunit_t *unit = gl_state.units + unitnum; if (unitnum >= backendimageunits) return; - if (r_showtrispass) - return; // update 1d texture binding if (unit->t1d) { @@ -1404,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) @@ -1417,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) @@ -1432,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) @@ -1451,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 } } @@ -1464,8 +1468,6 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) gltextureunit_t *unit = gl_state.units + unitnum; if (unitnum >= backendimageunits) return; - if (r_showtrispass) - return; // update 1d texture binding if (unit->t1d) { @@ -1473,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) @@ -1486,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) @@ -1499,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) @@ -1514,38 +1519,40 @@ 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 } } void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix) { gltextureunit_t *unit = gl_state.units + unitnum; - if (r_showtrispass) - return; if (matrix->m[3][3]) { // 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 @@ -1554,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 } } } @@ -1565,8 +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; - if (r_showtrispass) - return; + CHECKGLERROR if (gl_combine.integer) { // GL_ARB_texture_env_combine @@ -1615,19 +1622,18 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i } } -void R_Mesh_State(const rmeshstate_t *m) +void R_Mesh_TextureState(const rmeshstate_t *m) { unsigned int i; BACKENDACTIVECHECK - R_Mesh_VertexPointer(m->pointer_vertex); - R_Mesh_ColorPointer(m->pointer_color); - + CHECKGLERROR if (gl_backend_rebindtextures) { gl_backend_rebindtextures = false; GL_SetupTextureState(); + CHECKGLERROR } for (i = 0;i < backendimageunits;i++) @@ -1644,577 +1650,144 @@ void R_Mesh_State(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]); } -} - -void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements) -{ - qglBegin(GL_LINES); - for (;numtriangles;numtriangles--, elements += 3) - { - qglArrayElement(elements[0]);qglArrayElement(elements[1]); - qglArrayElement(elements[1]);qglArrayElement(elements[2]); - qglArrayElement(elements[2]);qglArrayElement(elements[0]); - } - qglEnd(); CHECKGLERROR } -/* -============================================================================== - - SCREEN SHOTS - -============================================================================== -*/ - -qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect) +void R_Mesh_ResetTextureState(void) { - int indices[3] = {0,1,2}; - qboolean ret; + unsigned int unitnum; - if (!r_render.integer) - return false; + BACKENDACTIVECHECK - qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1); CHECKGLERROR - - if (scr_screenshot_gamma.value != 1 && gammacorrect) + if (gl_backend_rebindtextures) { - int i; - double igamma = 1.0 / scr_screenshot_gamma.value; - unsigned char ramp[256]; - for (i = 0;i < 256;i++) - ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0); - for (i = 0;i < width*height*3;i++) - buffer1[i] = ramp[buffer1[i]]; + gl_backend_rebindtextures = false; + GL_SetupTextureState(); + CHECKGLERROR } - Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices); - - if (jpeg) - ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2); - else - ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3); - - return ret; -} - -//============================================================================= - -void R_ClearScreen(void) -{ - if (r_render.integer) + for (unitnum = 0;unitnum < backendimageunits;unitnum++) { - // clear to black - if (fogenabled) - qglClearColor(fogcolor[0],fogcolor[1],fogcolor[2],0); - else - qglClearColor(0,0,0,0); - CHECKGLERROR - qglClearDepth(1);CHECKGLERROR - if (gl_stencil) + gltextureunit_t *unit = gl_state.units + unitnum; + // update 1d texture binding + if (unit->t1d) { - // LordHavoc: we use a stencil centered around 128 instead of 0, - // to avoid clamping interfering with strange shadow volume - // drawing orders - qglClearStencil(128);CHECKGLERROR + GL_ActiveTexture(unitnum); + if (unitnum < backendunits) + { + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } + unit->t1d = 0; + qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR } - // clear the screen - GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0)); - // set dithering mode - if (gl_dither.integer) + // update 2d texture binding + if (unit->t2d) { - qglEnable(GL_DITHER);CHECKGLERROR + GL_ActiveTexture(unitnum); + if (unitnum < backendunits) + { + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + } + unit->t2d = 0; + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } - else + // update 3d texture binding + if (unit->t3d) { - qglDisable(GL_DITHER);CHECKGLERROR + GL_ActiveTexture(unitnum); + if (unitnum < backendunits) + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } + unit->t3d = 0; + 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);CHECKGLERROR + } + unit->tcubemap = 0; + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } } -} - -qboolean CL_VM_UpdateView (void); -void SCR_DrawConsole (void); - -int r_stereo_side; - -void SCR_DrawScreen (void) -{ - R_Mesh_Start(); - - if (r_timereport_active) - R_TimeReport("setup"); - - if (cls.signon == SIGNONS) + for (unitnum = 0;unitnum < backendarrayunits;unitnum++) { - float size; - - size = scr_viewsize.value * (1.0 / 100.0); - size = min(size, 1); - - if (r_stereo_sidebyside.integer) + gltextureunit_t *unit = gl_state.units + unitnum; + // texture array unit is disabled, disable the array + if (unit->arrayenabled) { - r_refdef.width = vid.width * size / 2.5; - r_refdef.height = vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100); - r_refdef.x = (vid.width - r_refdef.width * 2.5) * 0.5; - r_refdef.y = (vid.height - r_refdef.height)/2; - if (r_stereo_side) - r_refdef.x += r_refdef.width * 1.5; + unit->arrayenabled = false; + GL_ClientActiveTexture(unitnum); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR } - else + } + for (unitnum = 0;unitnum < backendunits;unitnum++) + { + gltextureunit_t *unit = gl_state.units + unitnum; + // no texmatrix specified, revert to identity + if (unit->texmatrixenabled) { - r_refdef.width = vid.width * size; - r_refdef.height = vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100); - r_refdef.x = (vid.width - r_refdef.width)/2; - r_refdef.y = (vid.height - r_refdef.height)/2; + unit->texmatrixenabled = false; + CHECKGLERROR + qglMatrixMode(GL_TEXTURE);CHECKGLERROR + GL_ActiveTexture(unitnum); + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + } + if (gl_combine.integer) + { + // GL_ARB_texture_env_combine + if (unit->combinergb != GL_MODULATE) + { + unit->combinergb = GL_MODULATE; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR + } + if (unit->combinealpha != GL_MODULATE) + { + unit->combinealpha = GL_MODULATE; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR + } + if (unit->rgbscale != 1) + { + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = 1));CHECKGLERROR + } + if (unit->alphascale != 1) + { + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = 1));CHECKGLERROR + } } - - // LordHavoc: viewzoom (zoom in for sniper rifles, etc) - // LordHavoc: this is designed to produce widescreen fov values - // when the screen is wider than 4/3 width/height aspect, to do - // this it simply assumes the requested fov is the vertical fov - // for a 4x3 display, if the ratio is not 4x3 this makes the fov - // higher/lower according to the ratio - r_refdef.frustum_y = tan(scr_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0); - r_refdef.frustum_x = r_refdef.frustum_y * (float)r_refdef.width / (float)r_refdef.height / vid_pixelheight.value; - - r_refdef.frustum_x *= r_refdef.frustumscale_x; - r_refdef.frustum_y *= r_refdef.frustumscale_y; - - if(!CL_VM_UpdateView()) - R_RenderView(); else - SCR_DrawConsole(); - - if (scr_zoomwindow.integer) { - float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0; - float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0; - r_refdef.width = vid.width * sizex; - r_refdef.height = vid.height * sizey; - r_refdef.x = (vid.width - r_refdef.width)/2; - r_refdef.y = 0; - - r_refdef.frustum_y = tan(scr_zoomwindow_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0); - r_refdef.frustum_x = r_refdef.frustum_y * vid_pixelheight.value * (float)r_refdef.width / (float)r_refdef.height; - - r_refdef.frustum_x *= r_refdef.frustumscale_x; - r_refdef.frustum_y *= r_refdef.frustumscale_y; - - if(!CL_VM_UpdateView()) - R_RenderView(); + // normal GL texenv + if (unit->combinergb != GL_MODULATE) + { + unit->combinergb = GL_MODULATE; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR + } } } - - if (!r_stereo_sidebyside.integer) - { - r_refdef.width = vid.width; - r_refdef.height = vid.height; - r_refdef.x = 0; - r_refdef.y = 0; - } - - // draw 2D stuff - R_DrawQueue(); - - R_Mesh_Finish(); - - if (r_timereport_active) - R_TimeReport("meshfinish"); -} - -void SCR_UpdateLoadingScreen (void) -{ - float x, y; - cachepic_t *pic; - rmeshstate_t m; - // don't do anything if not initialized yet - if (vid_hidden) - return; - r_showtrispass = 0; - VID_UpdateGamma(false); - qglViewport(0, 0, vid.width, vid.height); - //qglDisable(GL_SCISSOR_TEST); - //qglDepthMask(1); - qglColorMask(1,1,1,1); - //qglClearColor(0,0,0,0); - //qglClear(GL_COLOR_BUFFER_BIT); - //qglCullFace(GL_FRONT); - //qglDisable(GL_CULL_FACE); - //R_ClearScreen(); - R_Textures_Frame(); - GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100); - R_Mesh_Start(); - R_Mesh_Matrix(&identitymatrix); - // draw the loading plaque - pic = Draw_CachePic("gfx/loading", false); - x = (vid_conwidth.integer - pic->width)/2; - y = (vid_conheight.integer - pic->height)/2; - GL_Color(1,1,1,1); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthTest(false); - memset(&m, 0, sizeof(m)); - m.pointer_vertex = varray_vertex3f; - m.pointer_texcoord[0] = varray_texcoord2f[0]; - m.tex[0] = R_GetTexture(pic->tex); - R_Mesh_State(&m); - varray_vertex3f[0] = varray_vertex3f[9] = x; - varray_vertex3f[1] = varray_vertex3f[4] = y; - varray_vertex3f[3] = varray_vertex3f[6] = x + pic->width; - varray_vertex3f[7] = varray_vertex3f[10] = y + pic->height; - varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0; - varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0; - varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1; - varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1; - GL_LockArrays(0, 4); - R_Mesh_Draw(0, 4, 2, polygonelements); - GL_LockArrays(0, 0); - R_Mesh_Finish(); - // refresh - VID_Finish(false); } -/* -================== -SCR_UpdateScreen - -This is called every frame, and can also be called explicitly to flush -text to the screen. -================== -*/ -void SCR_UpdateScreen (void) +void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements) { - if (vid_hidden) - return; - - if (r_textureunits.integer > gl_textureunits) - Cvar_SetValueQuick(&r_textureunits, gl_textureunits); - if (r_textureunits.integer < 1) - Cvar_SetValueQuick(&r_textureunits, 1); - - if (gl_combine.integer && !gl_combine_extension) - Cvar_SetValueQuick(&gl_combine, 0); - - r_showtrispass = 0; - CHECKGLERROR - qglViewport(0, 0, vid.width, vid.height); - qglDisable(GL_SCISSOR_TEST); - qglDepthMask(1); - qglColorMask(1,1,1,1); - qglClearColor(0,0,0,0); - qglClear(GL_COLOR_BUFFER_BIT); - CHECKGLERROR - - if (r_timereport_active) - R_TimeReport("clear"); - - if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer) + qglBegin(GL_LINES); + for (;numtriangles;numtriangles--, elements += 3) { - matrix4x4_t originalmatrix = r_refdef.viewentitymatrix; - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[1][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[2][1]; - - if (r_stereo_sidebyside.integer) - r_stereo_side = 0; - - if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) - { - r_refdef.colormask[0] = 1; - r_refdef.colormask[1] = 0; - r_refdef.colormask[2] = 0; - } - - SCR_DrawScreen(); - - r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1]; - r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[1][1]; - r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[2][1]; - - if (r_stereo_sidebyside.integer) - r_stereo_side = 1; - - if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) - { - r_refdef.colormask[0] = 0; - r_refdef.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer; - r_refdef.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer; - } - - SCR_DrawScreen(); - - r_refdef.viewentitymatrix = originalmatrix; + qglArrayElement(elements[0]);qglArrayElement(elements[1]); + qglArrayElement(elements[1]);qglArrayElement(elements[2]); + qglArrayElement(elements[2]);qglArrayElement(elements[0]); } - else - SCR_DrawScreen(); - - VID_Finish(true); - if (r_timereport_active) - R_TimeReport("finish"); -} - - -//=========================================================================== -// dynamic vertex array buffer subsystem -//=========================================================================== - -// FIXME: someday this should be dynamically allocated and resized? -float varray_vertex3f[65536*3]; -float varray_svector3f[65536*3]; -float varray_tvector3f[65536*3]; -float varray_normal3f[65536*3]; -float varray_color4f[65536*4]; -float varray_texcoord2f[4][65536*2]; -float varray_texcoord3f[4][65536*3]; -int earray_element3i[65536]; -float varray_vertex3f2[65536*3]; - -//=========================================================================== -// vertex array caching subsystem -//=========================================================================== - -typedef struct rcachearraylink_s -{ - struct rcachearraylink_s *next, *prev; - struct rcachearrayitem_s *data; -} -rcachearraylink_t; - -typedef struct rcachearrayitem_s -{ - // the original request structure - rcachearrayrequest_t request; - // active - int active; - // offset into r_mesh_rcachedata - int offset; - // for linking this into the sequential list - rcachearraylink_t sequentiallink; - // for linking this into the lookup list - rcachearraylink_t hashlink; -} -rcachearrayitem_t; - -#define RCACHEARRAY_HASHSIZE 65536 -#define RCACHEARRAY_ITEMS 4096 -#define RCACHEARRAY_DEFAULTSIZE (4 << 20) - -// all active items are linked into this chain in sorted order -static rcachearraylink_t r_mesh_rcachesequentialchain; -// all inactive items are linked into this chain in unknown order -static rcachearraylink_t r_mesh_rcachefreechain; -// all active items are also linked into these chains (using their hashlink) -static rcachearraylink_t r_mesh_rcachechain[RCACHEARRAY_HASHSIZE]; - -// all items are stored here, whether active or inactive -static rcachearrayitem_t r_mesh_rcacheitems[RCACHEARRAY_ITEMS]; - -// size of data buffer -static int r_mesh_rcachedata_size = RCACHEARRAY_DEFAULTSIZE; -// data buffer -static unsigned char r_mesh_rcachedata[RCACHEARRAY_DEFAULTSIZE]; - -// current state -static int r_mesh_rcachedata_offset; -static rcachearraylink_t *r_mesh_rcachesequentialchain_current; - -static void R_Mesh_CacheArray_Startup(void) -{ - int i; - rcachearraylink_t *l; - // prepare all the linked lists - l = &r_mesh_rcachesequentialchain;l->next = l->prev = l;l->data = NULL; - l = &r_mesh_rcachefreechain;l->next = l->prev = l;l->data = NULL; - memset(&r_mesh_rcachechain, 0, sizeof(r_mesh_rcachechain)); - for (i = 0;i < RCACHEARRAY_HASHSIZE;i++) - { - l = &r_mesh_rcachechain[i]; - l->next = l->prev = l; - l->data = NULL; - } - memset(&r_mesh_rcacheitems, 0, sizeof(r_mesh_rcacheitems)); - for (i = 0;i < RCACHEARRAY_ITEMS;i++) - { - r_mesh_rcacheitems[i].hashlink.data = r_mesh_rcacheitems[i].sequentiallink.data = &r_mesh_rcacheitems[i]; - l = &r_mesh_rcacheitems[i].sequentiallink; - l->next = &r_mesh_rcachefreechain; - l->prev = l->next->prev; - l->next->prev = l->prev->next = l; - } - // clear other state - r_mesh_rcachedata_offset = 0; - r_mesh_rcachesequentialchain_current = &r_mesh_rcachesequentialchain; -} - -static void R_Mesh_CacheArray_Shutdown(void) -{ -} - -/* -static void R_Mesh_CacheArray_ValidateState(int num) -{ - rcachearraylink_t *l, *lhead; - lhead = &r_mesh_rcachesequentialchain; - if (r_mesh_rcachesequentialchain_current == lhead) - return; - for (l = lhead->next;l != lhead;l = l->next) - if (r_mesh_rcachesequentialchain_current == l) - return; - Sys_Error("%i", num); -} -*/ - -int R_Mesh_CacheArray(rcachearrayrequest_t *r) -{ - rcachearraylink_t *l, *lhead, *lnext; - rcachearrayitem_t *d; - int hashindex, offset, offsetend; - - //R_Mesh_CacheArray_ValidateState(3); - // calculate a hashindex to choose a cache chain - r->data = NULL; - hashindex = CRC_Block((unsigned char *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE; - - // is it already cached? - for (lhead = &r_mesh_rcachechain[hashindex], l = lhead->next;l != lhead;l = l->next) - { - if (!memcmp(&l->data->request, r, sizeof(l->data->request))) - { - // we have it cached already - r->data = r_mesh_rcachedata + l->data->offset; - return false; - } - } - - // we need to add a new cache item, this means finding a place for the new - // data and making sure we have a free item available, lots of work... - - // check if buffer needs to wrap - if (r_mesh_rcachedata_offset + r->data_size > r_mesh_rcachedata_size) - { - /* - if (r->data_size * 10 > r_mesh_rcachedata_size) - { - // realloc whole cache - } - */ - // reset back to start - r_mesh_rcachedata_offset = 0; - r_mesh_rcachesequentialchain_current = &r_mesh_rcachesequentialchain; - } - offset = r_mesh_rcachedata_offset; - r_mesh_rcachedata_offset += r->data_size; - offsetend = r_mesh_rcachedata_offset; - //R_Mesh_CacheArray_ValidateState(4); - - /* - { - int n; - for (lhead = &r_mesh_rcachesequentialchain, l = lhead->next, n = 0;l != lhead;l = l->next, n++); - Con_Printf("R_Mesh_CacheArray: new data range %i:%i, %i items are already linked\n", offset, offsetend, n); - } - */ - - // make room for the new data (remove old items) - lhead = &r_mesh_rcachesequentialchain; - l = r_mesh_rcachesequentialchain_current; - if (l == lhead) - l = l->next; - while (l != lhead && l->data->offset < offsetend && l->data->offset + l->data->request.data_size > offset) - { - //r_mesh_rcachesequentialchain_current = l; - //R_Mesh_CacheArray_ValidateState(8); - lnext = l->next; - // if at the end of the chain, wrap around - if (lnext == lhead) - lnext = lnext->next; - //r_mesh_rcachesequentialchain_current = lnext; - //R_Mesh_CacheArray_ValidateState(10); - - // unlink from sequential chain - l->next->prev = l->prev; - l->prev->next = l->next; - //R_Mesh_CacheArray_ValidateState(11); - // link into free chain - l->next = &r_mesh_rcachefreechain; - l->prev = l->next->prev; - l->next->prev = l->prev->next = l; - //R_Mesh_CacheArray_ValidateState(12); - - l = &l->data->hashlink; - // unlink from hash chain - l->next->prev = l->prev; - l->prev->next = l->next; - - l = lnext; - //r_mesh_rcachesequentialchain_current = l; - //R_Mesh_CacheArray_ValidateState(9); - } - //r_mesh_rcachesequentialchain_current = l; - //R_Mesh_CacheArray_ValidateState(5); - // gobble an extra item if we have no free items available - if (r_mesh_rcachefreechain.next == &r_mesh_rcachefreechain) - { - lnext = l->next; - - // unlink from sequential chain - l->next->prev = l->prev; - l->prev->next = l->next; - // link into free chain - l->next = &r_mesh_rcachefreechain; - l->prev = l->next->prev; - l->next->prev = l->prev->next = l; - - l = &l->data->hashlink; - // unlink from hash chain - l->next->prev = l->prev; - l->prev->next = l->next; - - l = lnext; - } - r_mesh_rcachesequentialchain_current = l; - //R_Mesh_CacheArray_ValidateState(6); - - // now take an item from the free chain - l = r_mesh_rcachefreechain.next; - // set it up - d = l->data; - d->request = *r; - d->offset = offset; - // unlink - l->next->prev = l->prev; - l->prev->next = l->next; - // relink to sequential - l->next = r_mesh_rcachesequentialchain_current->prev; - l->prev = l->next->prev; - while (l->next->data && l->data && l->next->data->offset <= d->offset) - { - //Con_Print(">\n"); - l->next = l->next->next; - l->prev = l->prev->next; - } - while (l->prev->data && l->data && l->prev->data->offset >= d->offset) - { - //Con_Print("<\n"); - l->prev = l->prev->prev; - l->next = l->next->prev; - } - l->next->prev = l->prev->next = l; - // also link into hash chain - l = &l->data->hashlink; - l->next = &r_mesh_rcachechain[hashindex]; - l->prev = l->next->prev; - l->prev->next = l; - l->next->prev = l->prev->next = l; - - - //r_mesh_rcachesequentialchain_current = d->sequentiallink.next; - - //R_Mesh_CacheArray_ValidateState(7); - // and finally set the data pointer - r->data = r_mesh_rcachedata + d->offset; - // and tell the caller to fill the array - return true; + qglEnd(); + CHECKGLERROR } -