added gl_finish cvar, defaults to 0, this was a noticable speed gain (22.5% on timede...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4288 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_backend.c b/gl_backend.c
index f5117ecedb65f46bacc3a56ddcd377894bfdab9a..89f2017501f664a49cfde63e26c7508296b23886 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1384,7 +1384,8 @@ showtris:
        {
                // tell driver to commit it's partially full geometry queue to the rendering queue
                // (this doesn't wait for the commands themselves to complete)
-               qglFlush();
+               if (gl_finish.integer)
+                       qglFlush();
        }
        else
        {

diff --git a/glquake.h b/glquake.h
index 034b27dd910e3d895698028a6748004e51b7e85c..31cd56f024362647ec539f4288eb8fc982edff98 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -303,7 +303,6 @@ extern int gl_combine_extension;
 #define GL_MAX_ELEMENTS_INDICES                        0x80E9
 #endif
 
-extern cvar_t gl_combine;
 
 extern int gl_textureshader;
 #ifndef GL_TEXTURE_SHADER_NV

diff --git a/vid.h b/vid.h
index 3c845043275a4549d0bfc5356b5570530f3f82ef..5325f9d363df8dce21c469133490d31f3a535d42 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -52,6 +52,9 @@ extern cvar_t vid_height;
 extern cvar_t vid_bitsperpixel;
 extern cvar_t vid_mouse;
 
+extern cvar_t gl_combine;
+extern cvar_t gl_finish;
+
 extern cvar_t v_gamma;
 extern cvar_t v_contrast;
 extern cvar_t v_brightness;

diff --git a/vid_glx.c b/vid_glx.c
index c05f0d3be2729c3c0fc77fe8ec49c94cad05a98b..7e670a13c3d2068c8529a0043c415784dc505e45 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -607,7 +607,8 @@ void VID_Finish (void)
        int usemouse;
        if (r_render.integer)
        {
-               qglFinish();
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
                qglXSwapBuffers(vidx11_display, win);
        }
 

diff --git a/vid_sdl.c b/vid_sdl.c
index f42e821d0ced49453639ac8bd7253fe1741e53fa..b4765400f1abc5f85d37db1f806ef609388b6ad4 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -474,7 +474,8 @@ void VID_Finish (void)
        Uint8 appstate;
        int vid_usemouse;
 
-       qglFinish();
+       if (r_speeds.integer || gl_finish.integer)
+               qglFinish();
        SDL_GL_SwapBuffers();
 
        //react on appstate changes

diff --git a/vid_shared.c b/vid_shared.c
index de8bf147b4c0a25c945459886613fa24cf639e20..b80d26aa9b60b88edb15b83cd9f11ccf396c944f 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -65,6 +65,7 @@ cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"};
 
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"};
 cvar_t gl_combine = {CVAR_SAVE, "gl_combine", "1"};
+cvar_t gl_finish = {0, "gl_finish", "0"};
 
 cvar_t in_pitch_min = {0, "in_pitch_min", "-70"};
 cvar_t in_pitch_max = {0, "in_pitch_max", "80"};
@@ -773,6 +774,7 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&vid_bitsperpixel);
        Cvar_RegisterVariable(&vid_mouse);
        Cvar_RegisterVariable(&gl_combine);
+       Cvar_RegisterVariable(&gl_finish);
        Cvar_RegisterVariable(&in_pitch_min);
        Cvar_RegisterVariable(&in_pitch_max);
        Cvar_RegisterVariable(&m_filter);

diff --git a/vid_wgl.c b/vid_wgl.c
index 13c9b42562835bf3df5f7c45662766f0887062e0..ffdc689db51a025614b6531481fb188e0fee28b1 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -307,7 +307,8 @@ void VID_Finish (void)
        int vid_usemouse;
        if (r_render.integer && !scr_skipupdate)
        {
-               qglFinish();
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
                hdc = GetDC(mainwindow);
                SwapBuffers(hdc);
                ReleaseDC(mainwindow, hdc);