made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / gl_backend.c

diff --git a/gl_backend.c b/gl_backend.c
index 3c3b3969acbba21b9e50c30eb0a91c62570265e9..61e606fea084a01441e68d9c1cadaf2c26694aac 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -174,9 +174,9 @@ static void gl_backend_start(void)
        if (gl_support_fragment_shader)
        {
                CHECKGLERROR
-               qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &backendimageunits);
+               qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, (int *)&backendimageunits);
                CHECKGLERROR
-               qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &backendarrayunits);
+               qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, (int *)&backendarrayunits);
                CHECKGLERROR
                Con_Printf("GLSL shader support detected: texture units = %i texenv, %i image, %i array\n", backendunits, backendimageunits, backendarrayunits);
        }
@@ -432,8 +432,8 @@ void GL_SetupTextureState(void)
        unsigned int i;
        gltextureunit_t *unit;
        CHECKGLERROR
-       gl_state.unit = -1;
-       gl_state.clientunit = -1;
+       gl_state.unit = MAX_TEXTUREUNITS;
+       gl_state.clientunit = MAX_TEXTUREUNITS;
        for (i = 0;i < MAX_TEXTUREUNITS;i++)
        {
                unit = gl_state.units + i;
@@ -709,7 +709,7 @@ void GL_LockArrays(int first, int count)
 void GL_Scissor (int x, int y, int width, int height)
 {
        CHECKGLERROR
-       qglScissor(x, vid.realheight - (y + height),width,height);
+       qglScissor(x, vid.height - (y + height),width,height);
        CHECKGLERROR
 }
 
@@ -1102,6 +1102,8 @@ 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
@@ -1127,6 +1129,8 @@ void R_Mesh_ColorPointer(const float *color4f)
 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
        if (texcoord)
        {
@@ -1164,6 +1168,8 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendunits)
                return;
+       if (r_showtrispass)
+               return;
        // update 1d texture binding
        if (unit->t1d != tex1d)
        {
@@ -1255,6 +1261,8 @@ void R_Mesh_TexBind1D(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendunits)
                return;
+       if (r_showtrispass)
+               return;
        // update 1d texture binding
        if (unit->t1d != texnum)
        {
@@ -1310,6 +1318,8 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendunits)
                return;
+       if (r_showtrispass)
+               return;
        // update 1d texture binding
        if (unit->t1d)
        {
@@ -1365,6 +1375,8 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendunits)
                return;
+       if (r_showtrispass)
+               return;
        // update 1d texture binding
        if (unit->t1d)
        {
@@ -1420,6 +1432,8 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendunits)
                return;
+       if (r_showtrispass)
+               return;
        // update 1d texture binding
        if (unit->t1d)
        {
@@ -1473,6 +1487,8 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
 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
@@ -1505,6 +1521,8 @@ 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;
        if (gl_combine.integer)
        {
                // GL_ARB_texture_env_combine
@@ -1560,10 +1578,6 @@ void R_Mesh_State(const rmeshstate_t *m)
        BACKENDACTIVECHECK
 
        R_Mesh_VertexPointer(m->pointer_vertex);
-
-       if (r_showtrispass)
-               return;
-
        R_Mesh_ColorPointer(m->pointer_color);
 
        if (gl_backend_rebindtextures)
@@ -1609,7 +1623,7 @@ void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, co
 ==============================================================================
 */
 
-qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg)
+qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect)
 {
        int     indices[3] = {0,1,2};
        qboolean ret;
@@ -1620,7 +1634,7 @@ qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *b
        qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
        CHECKGLERROR
 
-       if (scr_screenshot_gamma.value != 1)
+       if (scr_screenshot_gamma.value != 1 && gammacorrect)
        {
                int i;
                double igamma = 1.0 / scr_screenshot_gamma.value;
@@ -1719,19 +1733,19 @@ void SCR_DrawScreen (void)
 
                        if (r_stereo_sidebyside.integer)
                        {
-                               r_refdef.width = vid.realwidth * size / 2.5;
-                               r_refdef.height = vid.realheight * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
-                               r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5;
-                               r_refdef.y = (vid.realheight - r_refdef.height)/2;
+                               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;
                        }
                        else
                        {
-                               r_refdef.width = vid.realwidth * size;
-                               r_refdef.height = vid.realheight * size * (1 - bound(0, r_letterbox.value, 100) / 100);
-                               r_refdef.x = (vid.realwidth - r_refdef.width)/2;
-                               r_refdef.y = (vid.realheight - r_refdef.height)/2;
+                               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;
                        }
 
                        // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
@@ -1744,9 +1758,9 @@ void SCR_DrawScreen (void)
                        {
                                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.realwidth * sizex;
-                               r_refdef.height = vid.realheight * sizey;
-                               r_refdef.x = (vid.realwidth - r_refdef.width)/2;
+                               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.fov_x = scr_zoomwindow_fov.value * r_refdef.fovscale_x;
                                r_refdef.fov_y = CalcFov(scr_zoomwindow_fov.value, r_refdef.width, r_refdef.height) * r_refdef.fovscale_y;
@@ -1757,8 +1771,8 @@ void SCR_DrawScreen (void)
 
                if (!r_stereo_sidebyside.integer)
                {
-                       r_refdef.width = vid.realwidth;
-                       r_refdef.height = vid.realheight;
+                       r_refdef.width = vid.width;
+                       r_refdef.height = vid.height;
                        r_refdef.x = 0;
                        r_refdef.y = 0;
                }
@@ -1783,9 +1797,8 @@ void SCR_UpdateLoadingScreen (void)
        if (vid_hidden)
                return;
        r_showtrispass = 0;
-       VID_GetWindowSize(&vid.realx, &vid.realy, &vid.realwidth, &vid.realheight);
        VID_UpdateGamma(false);
-       qglViewport(0, 0, vid.realwidth, vid.realheight);
+       qglViewport(0, 0, vid.width, vid.height);
        //qglDisable(GL_SCISSOR_TEST);
        //qglDepthMask(1);
        qglColorMask(1,1,1,1);
@@ -1844,11 +1857,11 @@ void SCR_UpdateScreen (void)
        if (r_textureunits.integer < 1)
                Cvar_SetValueQuick(&r_textureunits, 1);
 
-       if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2))
+       if (gl_combine.integer && !gl_combine_extension)
                Cvar_SetValueQuick(&gl_combine, 0);
 
        CHECKGLERROR
-       qglViewport(0, 0, vid.realwidth, vid.realheight);
+       qglViewport(0, 0, vid.width, vid.height);
        qglDisable(GL_SCISSOR_TEST);
        qglDepthMask(1);
        qglColorMask(1,1,1,1);
@@ -2039,7 +2052,7 @@ int R_Mesh_CacheArray(rcachearrayrequest_t *r)
        //R_Mesh_CacheArray_ValidateState(3);
        // calculate a hashindex to choose a cache chain
        r->data = NULL;
-       hashindex = CRC_Block((void *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE;
+       hashindex = CRC_Block((qbyte *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE;
 
        // is it already cached?
        for (lhead = &r_mesh_rcachechain[hashindex], l = lhead->next;l != lhead;l = l->next)