slight optimizations to GL_ConvertColorsFloattoByte

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 7f4cc5f6438194b515d3491cf3bc0e84fa586de2..08f7cdd435feb24b747eddd0e964d4107ec10fac 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -66,7 +66,7 @@ qboolean              scr_skipupdate;
 
 static vmode_t modelist[MAX_MODE_LIST];
 static int             nummodes;
-static vmode_t *pcurrentmode;
+//static vmode_t       *pcurrentmode;
 static vmode_t badmode;
 
 static DEVMODE gdevmode;
@@ -93,14 +93,10 @@ unsigned char       vid_curpal[256*3];
 HGLRC  baseRC;
 HDC            maindc;
 
-glvert_t glv;
-
 HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
 
 viddef_t       vid;                            // global video state
 
-float          gldepthmin, gldepthmax;
-
 modestate_t    modestate = MS_UNINIT;
 
 void VID_MenuDraw (void);
@@ -253,16 +249,17 @@ qboolean VID_SetFullDIBMode (int modenum)
 
 int VID_SetMode (int modenum)
 {
-       int                             original_mode, temp;
-       qboolean                stat;
+       int                             original_mode;
+       //int                           temp;
+       qboolean                stat = 0;
     MSG                                msg;
 
        if ((windowed && (modenum != 0)) || (!windowed && (modenum < 1)) || (!windowed && (modenum >= nummodes)))
                Sys_Error ("Bad video mode\n");
 
 // so Con_Printfs don't mess us up by forcing vid and snd updates
-       temp = scr_disabled_for_loading;
-       scr_disabled_for_loading = true;
+//     temp = scr_disabled_for_loading;
+//     scr_disabled_for_loading = true;
 
        CDAudio_Pause ();
 
@@ -274,7 +271,7 @@ int VID_SetMode (int modenum)
        // Set either the fullscreen or windowed mode
        if (modelist[modenum].type == MS_WINDOWED)
        {
-//             if (vid_mouse.value && key_dest == key_game)
+//             if (vid_mouse.integer && key_dest == key_game)
 //             {
 //                     stat = VID_SetWindowedMode(modenum);
 //                     usingmouse = true;
@@ -305,7 +302,7 @@ int VID_SetMode (int modenum)
        VID_UpdateWindowStatus ();
 
        CDAudio_Resume ();
-       scr_disabled_for_loading = temp;
+//     scr_disabled_for_loading = temp;
 
        if (!stat)
                Sys_Error ("Couldn't set video mode");
@@ -367,32 +364,29 @@ void VID_UpdateWindowStatus (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 = WindowRect.right - WindowRect.left;
        *height = WindowRect.bottom - WindowRect.top;
-
-//     if (!wglMakeCurrent( maindc, baseRC ))
-//             Sys_Error ("wglMakeCurrent failed");
-
-//     glViewport (*x, *y, *width, *height);
 }
 
 
-void GL_EndRendering (void)
+void VID_Finish (void)
 {
        int usemouse;
-       if (r_render.value && !scr_skipupdate)
+       if (r_render.integer && !scr_skipupdate)
+       {
+               glFinish();
                SwapBuffers(maindc);
+       }
 
 // handle the mouse state when windowed if that's changed
        usemouse = false;
-       if (vid_mouse.value && key_dest == key_game)
+       if (vid_mouse.integer && key_dest == key_game)
                usemouse = true;
        if (modestate == MS_FULLDIB)
                usemouse = true;
@@ -508,7 +502,7 @@ BOOL bSetupPixelFormat(HDC hDC)
 
 
 
-byte scantokey[128] =
+qbyte scantokey[128] =
 {
 //     0           1      2     3     4     5       6       7      8         9      A       B           C     D            E           F
        0          ,27    ,'1'  ,'2'  ,'3'  ,'4'    ,'5'    ,'6'   ,'7'      ,'8'   ,'9'    ,'0'        ,'-'  ,'='         ,K_BACKSPACE,9     , // 0
@@ -522,7 +516,7 @@ byte scantokey[128] =
 };
 
 /*
-byte shiftscantokey[128] =
+qbyte shiftscantokey[128] =
 { 
 //     0           1      2     3     4     5       6       7      8         9      A       B           C    D            E           F 
        0          ,27    ,'!'  ,'@'  ,'#'  ,'$'    ,'%'    ,'^'   ,'&'      ,'*'   ,'('    ,')'        ,'_' ,'+'         ,K_BACKSPACE,9    , // 0
@@ -583,7 +577,7 @@ void ClearAllStates (void)
 }
 
 void VID_RestoreGameGamma(void);
-extern qboolean hostloopactive;
+extern qboolean host_loopactive;
 
 void AppActivate(BOOL fActive, BOOL minimize)
 /****************************************************************************
@@ -631,13 +625,13 @@ void AppActivate(BOOL fActive, BOOL minimize)
                        // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
                        MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
                }
-//             else if ((modestate == MS_WINDOWED) && vid_mouse.value && key_dest == key_game)
+//             else if ((modestate == MS_WINDOWED) && vid_mouse.integer && key_dest == key_game)
 //             {
 //                     usingmouse = true;
 //                     IN_ActivateMouse ();
 //                     IN_HideMouse ();
 //             }
-               if (hostloopactive)
+               if (host_loopactive)
                        VID_RestoreGameGamma();
        }
 
@@ -657,7 +651,7 @@ void AppActivate(BOOL fActive, BOOL minimize)
                                vid_wassuspended = true;
                        }
                }
-//             else if ((modestate == MS_WINDOWED) && vid_mouse.value)
+//             else if ((modestate == MS_WINDOWED) && vid_mouse.integer)
 //             {
 //                     usingmouse = false;
 //                     IN_DeactivateMouse ();
@@ -1183,7 +1177,7 @@ void VID_InitFullDIB (HINSTANCE hInstance)
                Con_SafePrintf ("No fullscreen DIB modes found\n");
 }
 
-static int grabsysgamma = true;
+//static int grabsysgamma = true;
 WORD systemgammaramps[3][256], currentgammaramps[3][256];
 
 int VID_SetGamma(float prescale, float gamma, float scale, float base)
@@ -1236,7 +1230,7 @@ void      VID_Init (void)
 {
        int             i;
 //     int             existingmode;
-       int             basenummodes, width, height, bpp, findbpp, done;
+       int             basenummodes, width, height = 0, bpp, findbpp, done;
        HDC             hdc;
        DEVMODE devmode;
 
@@ -1460,9 +1454,9 @@ extern void M_Menu_Options_f (void);
 extern void M_Print (int cx, int cy, char *str);
 extern void M_PrintWhite (int cx, int cy, char *str);
 extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
+extern void M_DrawPic (int x, int y, char *picname);
 
-static int     vid_line, vid_wmodes;
+static int     vid_wmodes;
 
 typedef struct
 {
@@ -1484,17 +1478,17 @@ VID_MenuDraw
 */
 void VID_MenuDraw (void)
 {
-       qpic_t          *p;
-       char            *ptr;
-       int                     lnummodes, i, k, column, row;
-       vmode_t         *pv;
+       cachepic_t *p;
+       char *ptr;
+       int lnummodes, i, k, column, row;
+       vmode_t *pv;
 
        p = Draw_CachePic ("gfx/vidmodes.lmp");
-       M_DrawPic ( (320-p->width)/2, 4, p);
+       M_DrawPic ( (320-p->width)/2, 4, "gfx/vidmodes.lmp");
 
        vid_wmodes = 0;
        lnummodes = VID_NumModes ();
-       
+
        for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
        {
                ptr = VID_GetModeDescription (i);