put parentheses around parameters to min/max/bound macros

[xonotic/darkplaces.git] / vid_3dfxsvga.c

diff --git a/vid_3dfxsvga.c b/vid_3dfxsvga.c
index 3f4e42661c506cee232bb6221ac5a60b8cc528dc..727424907c3ee473839f5ec510e381cea6ca4177 100644 (file)
--- a/vid_3dfxsvga.c
+++ b/vid_3dfxsvga.c
@@ -57,15 +57,13 @@ int VID_options_items = 0;
 
 /*-----------------------------------------------------------------------*/
 
-float          gldepthmin, gldepthmax;
-
 const char *gl_vendor;
 const char *gl_renderer;
 const char *gl_version;
 const char *gl_extensions;
 
 /*-----------------------------------------------------------------------*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
+void D_BeginDirectRect (int x, int y, qbyte *pbitmap, int width, int height)
 {
 }
 
@@ -86,7 +84,6 @@ void signal_handler(int sig)
        printf("Received signal %d, exiting...\n", sig);
        Host_Shutdown();
        abort();
-       //Sys_Quit();
        exit(0);
 }
 
@@ -97,9 +94,7 @@ void InitSig(void)
        signal(SIGQUIT, signal_handler);
        signal(SIGILL, signal_handler);
        signal(SIGTRAP, signal_handler);
-//     signal(SIGIOT, signal_handler);
        signal(SIGBUS, signal_handler);
-//     signal(SIGFPE, signal_handler);
        signal(SIGSEGV, signal_handler);
        signal(SIGTERM, signal_handler);
 }
@@ -129,7 +124,7 @@ void VID_SetupDithering(void)
                        dither_select(GR_DITHER_4x4);
                        Con_Printf ("4x4.\n");
                } else {
-                       glDisable(GL_DITHER);
+                       qglDisable(GL_DITHER);
                        Con_Printf ("disabled.\n");
                }
        }
@@ -139,29 +134,23 @@ void VID_SetupDithering(void)
 
 /*
 =================
-GL_BeginRendering
-
+VID_GetWindowSize
 =================
 */
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
+void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 {
        *x = *y = 0;
        *width = scr_width;
        *height = scr_height;
-
-//    if (!wglMakeCurrent( maindc, baseRC ))
-//             Sys_Error ("wglMakeCurrent failed");
-
-//     glViewport (*x, *y, *width, *height);
 }
 
-
-void GL_EndRendering (void)
+void VID_Finish (void)
 {
-       if (!r_render.value)
-               return;
-       glFlush();
-       fxMesaSwapBuffers();
+       if (r_render.integer)
+       {
+               qglFinish();
+               fxMesaSwapBuffers();
+       }
 }
 
 static int resolutions[][3]={
@@ -291,8 +280,6 @@ void VID_Init(void)
                vid.conheight = height;
        if (vid.conwidth > width)
                vid.conwidth = width;
-       vid.width = vid.conwidth;
-       vid.height = vid.conheight;
 
        InitSig(); // trap evil signals
 
@@ -301,24 +288,14 @@ void VID_Init(void)
        VID_SetupDithering(); // 3DFX specific
 
        Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-       vid.recalc_refdef = 1;                          // force a surface cache flush
 }
 
 void VID_ExtraOptionDraw(unsigned int options_draw_cursor)
 {
-/* Port specific Options menu entrys */
 }
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-/*
-       switch(option_cursor)
-       {
-       case 12:  // Always start with 12
-       break;
-       }
-*/
 }
 
 void VID_SetCaption (char *text)
@@ -328,3 +305,4 @@ void VID_SetCaption (char *text)
 void VID_HandlePause (qboolean pause)
 {
 }
+