Fix a crash on Doombringer duel5.bsp where one of the lights has more than 32768...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 73999c4880a6557715e73b004d47b3698ad5d89c..f5185602d2bc8e9f4b79a2eb3edcb4dc311c1c3d 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -30,14 +30,7 @@ extern int cl_available;
 
 typedef enum renderpath_e
 {
-       RENDERPATH_GL11,
-       RENDERPATH_GL13,
        RENDERPATH_GL20,
-       RENDERPATH_D3D9,
-       RENDERPATH_D3D10,
-       RENDERPATH_D3D11,
-       RENDERPATH_SOFT,
-       RENDERPATH_GLES1,
        RENDERPATH_GLES2
 }
 renderpath_t;
@@ -111,8 +104,8 @@ typedef struct viddef_s
        qboolean stencil;
        qboolean sRGB2D; // whether 2D rendering is sRGB corrected (based on sRGBcapable2D)
        qboolean sRGB3D; // whether 3D rendering is sRGB corrected (based on sRGBcapable3D)
-       qboolean sRGBcapable2D; // whether 2D rendering can be sRGB corrected (renderpath, v_hwgamma)
-       qboolean sRGBcapable3D; // whether 3D rendering can be sRGB corrected (renderpath, v_hwgamma)
+       qboolean sRGBcapable2D; // whether 2D rendering can be sRGB corrected (renderpath)
+       qboolean sRGBcapable3D; // whether 3D rendering can be sRGB corrected (renderpath)
 
        renderpath_t renderpath;
        qboolean forcevbo; // some renderpaths can not operate without it
@@ -133,13 +126,6 @@ typedef struct viddef_s
 
        viddef_support_t support;
 
-       // in RENDERPATH_SOFT this is a 32bpp native-endian ARGB framebuffer
-       // (native-endian ARGB meaning that in little endian it is BGRA bytes,
-       //  in big endian it is ARGB byte order, the format is converted during
-       //  blit to the window)
-       unsigned int *softpixels;
-       unsigned int *softdepthpixels;
-
        int forcetextype; // always use GL_BGRA for D3D, always use GL_RGBA for GLES, etc
 } viddef_t;
 
@@ -177,14 +163,8 @@ void VID_EnableJoystick(qboolean enable);
 
 extern qboolean vid_hidden;
 extern qboolean vid_activewindow;
-extern cvar_t vid_hardwaregammasupported;
-extern qboolean vid_usinghwgamma;
 extern qboolean vid_supportrefreshrate;
 
-extern cvar_t vid_soft;
-extern cvar_t vid_soft_threads;
-extern cvar_t vid_soft_interlace;
-
 extern cvar_t vid_fullscreen;
 extern cvar_t vid_width;
 extern cvar_t vid_height;
@@ -224,7 +204,6 @@ extern cvar_t v_color_grey_b;
 extern cvar_t v_color_white_r;
 extern cvar_t v_color_white_g;
 extern cvar_t v_color_white_b;
-extern cvar_t v_hwgamma;
 
 // brand of graphics chip
 extern const char *gl_vendor;
@@ -266,20 +245,9 @@ qboolean VID_InitMode(viddef_mode_t *mode);
 // allocates and opens an appropriate OpenGL context (and its window)
 
 
-// sets hardware gamma correction, returns false if the device does not
-// support gamma control
-// (ONLY called by VID_UpdateGamma and VID_RestoreSystemGamma)
-int VID_SetGamma(unsigned short *ramps, int rampsize);
-// gets hardware gamma correction, returns false if the device does not
-// support gamma control
-// (ONLY called by VID_UpdateGamma and VID_RestoreSystemGamma)
-int VID_GetGamma(unsigned short *ramps, int rampsize);
-// makes sure ramp arrays are big enough and calls VID_GetGamma/VID_SetGamma
+// updates cachegamma variables and bumps vid_gammatables_serial if anything changed
 // (ONLY to be called from VID_Finish!)
-void VID_UpdateGamma(qboolean force, int rampsize);
-// turns off hardware gamma ramps immediately
-// (called from various shutdown/deactivation functions)
-void VID_RestoreSystemGamma(void);
+void VID_UpdateGamma(void);
 
 qboolean VID_HasScreenKeyboardSupport(void);
 void VID_ShowKeyboard(qboolean show);