improved handling of video mode failures

[xonotic/darkplaces.git] / vid_shared.c

diff --git a/vid_shared.c b/vid_shared.c
index 4da77ee4efad5f645266e92a7efa418853da8b9c..b0568601358366cf59067fdda4add97edb49e5e0 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -82,6 +82,7 @@ cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1"};
 cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1"};
 cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1"};
 cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "1"};
+cvar_t v_psycho = {0, "v_psycho", "0"};
 
 // brand of graphics chip
 const char *gl_vendor;
@@ -240,7 +241,7 @@ int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *
        for (func = funcs;func && func->name;func++)
                *func->funcvariable = NULL;
 
-       if (disableparm && COM_CheckParm(disableparm))
+       if (disableparm && (COM_CheckParm(disableparm) || COM_CheckParm("-safe")))
        {
                Con_DPrintf("disabled by commandline\n");
                return false;
@@ -597,12 +598,15 @@ void VID_UpdateGamma(qboolean force)
 {
        cvar_t *c;
        float f;
+       static int forcenextframe = false;
 
        // LordHavoc: don't mess with gamma tables if running dedicated
        if (cls.state == ca_dedicated)
                return;
 
        if (!force
+        && !forcenextframe
+        && !v_psycho.integer
         && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer)
         && v_gamma.value == cachegamma
         && v_contrast.value == cachecontrast
@@ -618,6 +622,8 @@ void VID_UpdateGamma(qboolean force)
         && cachewhite[1] == v_color_white_g.value
         && cachewhite[2] == v_color_white_b.value)
                return;
+               
+       forcenextframe = false;
 
        if (vid_activewindow && v_hwgamma.integer)
        {
@@ -655,6 +661,45 @@ void VID_UpdateGamma(qboolean force)
                        BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512);
                }
 
+               // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
+               // immensely butchered it to work with variable framerates and fit in with
+               // the rest of darkplaces.
+               if (v_psycho.integer)
+               {
+                       int x, y;
+                       float t;
+                       static float n[3], nd[3], nt[3];
+                       static int init = true;
+                       unsigned short *ramp;
+                       forcenextframe = true;
+                       if (init)
+                       {
+                               init = false;
+                               for (x = 0;x < 3;x++)
+                               {
+                                       n[x] = lhrandom(0, 1);
+                                       nd[x] = (rand()&1)?-0.25:0.25;
+                                       nt[x] = lhrandom(1, 8.2);
+                               }
+                       }
+                       
+                       for (x = 0;x < 3;x++)
+                       {
+                               nt[x] -= host_realframetime;
+                               if (nt[x] < 0)
+                               {
+                                       nd[x] = -nd[x];
+                                       nt[x] += lhrandom(1, 8.2);
+                               }
+                               n[x] += nd[x] * host_realframetime;
+                               n[x] -= floor(n[x]);
+                       }
+               
+                       for (x = 0, ramp = vid_gammaramps;x < 3;x++)
+                               for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
+                                       *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;
+               }
+
                Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps));
        }
        else
@@ -695,6 +740,8 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&v_color_white_b);
 
        Cvar_RegisterVariable(&v_hwgamma);
+       
+       Cvar_RegisterVariable(&v_psycho);
 
        Cvar_RegisterVariable(&vid_fullscreen);
        Cvar_RegisterVariable(&vid_width);
@@ -715,7 +762,6 @@ int current_vid_fullscreen;
 int current_vid_width;
 int current_vid_height;
 int current_vid_bitsperpixel;
-extern int VID_InitMode (int fullscreen, int width, int height, int bpp);
 int VID_Mode(int fullscreen, int width, int height, int bpp)
 {
        Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp);
@@ -772,14 +818,14 @@ void VID_Restart_f(void)
 
 void VID_Open(void)
 {
-       int i, width, height;
+       int i, width, height, success;
        if (vid_commandlinecheck)
        {
                // interpret command-line parameters
                vid_commandlinecheck = false;
-               if ((i = COM_CheckParm("-window")) != 0)
+               if (COM_CheckParm("-window") || COM_CheckParm("-safe"))
                        Cvar_SetValueQuick(&vid_fullscreen, false);
-               if ((i = COM_CheckParm("-fullscreen")) != 0)
+               if (COM_CheckParm("-fullscreen"))
                        Cvar_SetValueQuick(&vid_fullscreen, true);
                width = 0;
                height = 0;
@@ -800,17 +846,18 @@ void VID_Open(void)
        }
 
        Con_DPrintf("Starting video system\n");
-       if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer))
+       success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
+       if (!success)
        {
                Con_Printf("Desired video mode fail, trying fallbacks...\n");
-               if (vid_fullscreen.integer)
-               {
-                       if (!VID_Mode(true, 640, 480, 16))
-                               if (!VID_Mode(false, 640, 480, 16))
-                                       Sys_Error("Video modes failed\n");
-               }
-               else
-                       Sys_Error("Windowed video failed\n");
+               if (!success && vid_bitsperpixel.integer > 16)
+                       success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, 16);
+               if (!success && (vid_width.integer > 640 || vid_height.integer > 480))
+                       success = VID_Mode(vid_fullscreen.integer, 640, 480, 16);
+               if (!success && vid_fullscreen.integer)
+                       success = VID_Mode(false, 640, 480, 16);
+               if (!success)
+                       Sys_Error("Video modes failed\n");
        }
        VID_OpenSystems();
 }