changed r_speeds glFinish to only occur when set to 2, not 1 or 3

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 395bb605e6c8a96db3a5753b06b7cb62da12e2a0..d08bab4b73c73b559692f16db0bd42808533553a 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -475,10 +475,14 @@ static void HandleEvents(void)
                        // window changed size/location
                        win_x = event.xconfigure.x;
                        win_y = event.xconfigure.y;
-                       if(vid_resizable.integer < 2)
+                       if(vid_resizable.integer < 2 || vid_isnetwmfullscreen)
                        {
                                vid.width = event.xconfigure.width;
                                vid.height = event.xconfigure.height;
+                               if(vid_isnetwmfullscreen)
+                                       Con_Printf("NetWM fullscreen: actually using resolution %dx%d\n", vid.width, vid.height);
+                               else
+                                       Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height);
                        }
                        break;
                case DestroyNotify:
@@ -696,7 +700,7 @@ void VID_Finish (void)
        if (r_render.integer)
        {
                CHECKGLERROR
-               if (r_speeds.integer || gl_finish.integer)
+               if (r_speeds.integer == 2 || gl_finish.integer)
                {
                        qglFinish();CHECKGLERROR
                }
@@ -755,7 +759,7 @@ void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, in
        *attrib++ = None;
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
 {
        int i;
        int attrib[32];
@@ -846,6 +850,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                        vid_isnetwmfullscreen = true;
                        vid_isfullscreen = true;
                        // width and height will be filled in later
+                       Con_DPrintf("Using NetWM fullscreen mode\n");
                }
 
                if(!vid_isfullscreen && vidmode_ext)
@@ -867,11 +872,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
                        for (i = 0; i < num_vidmodes; i++)
                        {
-                               if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay)
+                               if (*width > vidmodes[i]->hdisplay || *height > vidmodes[i]->vdisplay)
                                        continue;
 
-                               x = width - vidmodes[i]->hdisplay;
-                               y = height - vidmodes[i]->vdisplay;
+                               x = *width - vidmodes[i]->hdisplay;
+                               y = *height - vidmodes[i]->vdisplay;
                                dist = (x * x) + (y * y);
                                if (best_fit == -1 || dist < best_dist)
                                {
@@ -885,8 +890,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                                // LordHavoc: changed from ActualWidth/ActualHeight =,
                                // to width/height =, so the window will take the full area of
                                // the mode chosen
-                               width = vidmodes[best_fit]->hdisplay;
-                               height = vidmodes[best_fit]->vdisplay;
+                               *width = vidmodes[best_fit]->hdisplay;
+                               *height = vidmodes[best_fit]->vdisplay;
 
                                // change to the mode
                                XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
@@ -896,6 +901,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
                                // Move the viewport to top left
                                XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
+                               Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", *width, *height);
                        }
 
                        free(vidmodes);
@@ -907,8 +913,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                        // use the full desktop resolution
                        vid_isfullscreen = true;
                        // width and height will be filled in later
-                       width = DisplayWidth(vidx11_display, vidx11_screen);
-                       height = DisplayHeight(vidx11_display, vidx11_screen);
+                       *width = DisplayWidth(vidx11_display, vidx11_screen);
+                       *height = DisplayHeight(vidx11_display, vidx11_screen);
+                       Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", *width, *height);
                }
        }
 
@@ -944,7 +951,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
        }
 
-       win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+       win = XCreateWindow(vidx11_display, root, 0, 0, *width, *height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
 
        wmhints = XAllocWMHints();
        if(XpmCreatePixmapFromData(vidx11_display, win,
@@ -959,8 +966,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        szhints = XAllocSizeHints();
        if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
        {
-               szhints->min_width = szhints->max_width = width;
-               szhints->min_height = szhints->max_height = height;
+               szhints->min_width = szhints->max_width = *width;
+               szhints->min_height = szhints->max_height = *height;
                szhints->flags |= PMinSize | PMaxSize;
        }
 
@@ -1038,6 +1045,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        if (!vid_x11_dgasupported)
                Con_Print( "Failed to detect XF86DGA Mouse extension\n" );
 #endif
+
        GL_Init();
        return true;
 }