Cleaned up a bit..

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 99ec8842ad780c7fb50fb8e855a9dc8490e156db..16e012ab16a410e11117551ca53af04a90ba1993 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -82,13 +82,6 @@ static qboolean vidmode_active = false;
 
 /*-----------------------------------------------------------------------*/
 
-//int          texture_mode = GL_NEAREST;
-//int          texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int          texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int            texture_mode = GL_LINEAR;
-//int          texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int          texture_mode = GL_LINEAR_MIPMAP_LINEAR;
-
 int            texture_extension_number = 1;
 
 float          gldepthmin, gldepthmax;
@@ -597,25 +590,8 @@ void GL_Init (void)
        // LordHavoc: report supported extensions
        Con_Printf ("\nQSG extensions: %s\n", QSG_EXTENSIONS);
 
-//     glClearColor (1,0,0,0);
        glCullFace(GL_FRONT);
-//     glEnable(GL_TEXTURE_2D);
-//
-//     glEnable(GL_ALPHA_TEST);
        glAlphaFunc(GL_GREATER, 0.5);
-//
-//     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-//     glShadeModel (GL_FLAT);
-//
-//     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-//     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-//     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-//     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-//
-//     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//
-//     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-//     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 }
 
 /*
@@ -639,6 +615,8 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height)
 
 void GL_EndRendering (void)
 {
+       if (!r_render.value)
+               return;
        glFlush();
        glXSwapBuffers(dpy, win);
 }