rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / vid_3dfxsvga.c

diff --git a/vid_3dfxsvga.c b/vid_3dfxsvga.c
index 7136f0420ceb2c7b6b6bfb42477f7118d533ce39..97124a1ced1c7515d2325dec0adbe42517472954 100644 (file)
--- a/vid_3dfxsvga.c
+++ b/vid_3dfxsvga.c
@@ -104,75 +104,6 @@ void InitSig(void)
        signal(SIGTERM, signal_handler);
 }
 
-/*
-       VID_CheckMultitexture
-
-       Check for ARB, SGIS, or EXT multitexture support
-*/
-void VID_CheckMultitexture(void)
-{
-       Con_Printf ("Checking for multitexture... ");
-       if (COM_CheckParm ("-nomtex"))
-       {
-               Con_Printf ("disabled\n");
-               return;
-       }
-       dlhand = dlopen (NULL, RTLD_LAZY);
-       if (dlhand == NULL)
-       {
-               Con_Printf ("unable to check\n");
-               return;
-       }
-       if (strstr(gl_extensions, "GL_ARB_multitexture "))
-       {
-               Con_Printf ("GL_ARB_multitexture\n");
-               qglMTexCoord2f = (void *)dlsym(dlhand, "glMultiTexCoord2fARB");
-               qglSelectTexture = (void *)dlsym(dlhand, "glActiveTextureARB");
-               gl_mtex_enum = GL_TEXTURE0_ARB;
-               gl_mtexable = true;
-       }
-       else if (strstr(gl_extensions, "GL_SGIS_multitexture "))
-       {
-               Con_Printf ("GL_SGIS_multitexture\n");
-               qglMTexCoord2f = (void *)dlsym(dlhand, "glMTexCoord2fSGIS");
-               qglSelectTexture = (void *)dlsym(dlhand, "glSelectTextureSGIS");
-               gl_mtex_enum = TEXTURE0_SGIS;
-               gl_mtexable = true;
-       }
-       else
-               Con_Printf ("none found\n");
-       dlclose(dlhand);
-       dlhand = NULL;
-}
-
-void VID_CheckCVA(void)
-{
-       qglLockArraysEXT = NULL;
-       qglUnlockArraysEXT = NULL;
-       gl_supportslockarrays = false;
-       if (COM_CheckParm("-nocva"))
-       {
-               Con_Printf("...compiled vertex arrays disabled\n");
-               return;
-       }
-       dlhand = dlopen (NULL, RTLD_LAZY);
-       if (dlhand == NULL)
-       {
-               Con_Printf("Unable to open symbol list for main program.\n");
-               return;
-       }
-       if (strstr(gl_extensions, "GL_EXT_compiled_vertex_array"))
-       {
-               Con_Printf("...using compiled vertex arrays\n");
-               qglLockArraysEXT = (void *) dlsym(dlhand, "glLockArraysEXT");
-               qglUnlockArraysEXT = (void *) dlsym(dlhand, "glUnlockArraysEXT");
-               gl_supportslockarrays = true;
-       }
-       dlclose(dlhand);
-       dlhand = NULL;
-}
-
-
 typedef void (GLAPIENTRY *gl3DfxSetDitherModeEXT_FUNC) (GrDitherMode_t mode);
 
 void VID_SetupDithering(void)
@@ -227,7 +158,7 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height)
 
 void GL_EndRendering (void)
 {
-       if (!r_render.value)
+       if (!r_render.integer)
                return;
        glFlush();
        fxMesaSwapBuffers();
@@ -360,10 +291,6 @@ void VID_Init(void)
                vid.conheight = height;
        if (vid.conwidth > width)
                vid.conwidth = width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
-
-       vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
 
        InitSig(); // trap evil signals
 
@@ -373,7 +300,7 @@ void VID_Init(void)
 
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
 
-       vid.recalc_refdef = 1;                          // force a surface cache flush
+//     vid.recalc_refdef = 1;                          // force a surface cache flush
 }
 
 void VID_ExtraOptionDraw(unsigned int options_draw_cursor)