modified gamma handling, now VID_UpdateGamma is only called from VID_Finish, and...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 8ea82bbc3b1c4dfb200440da55687699b3bb1982..9d5ca1372176a729e937ae049c7f4f692f8e5781 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -24,16 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern int cl_available;
 
-typedef struct
+typedef struct viddef_s
 {
-       // these are set with VID_GetWindowSize and can change from frame to frame
-       int realx;
-       int realy;
-       int realwidth;
-       int realheight;
-
-       int conwidth;
-       int conheight;
+       // these are set by VID_Mode
+       int width;
+       int height;
+       int bitsperpixel;
+       int fullscreen;
+       int refreshrate;
 } viddef_t;
 
 // global video state
@@ -41,18 +39,24 @@ extern viddef_t vid;
 extern void (*vid_menudrawfn)(void);
 extern void (*vid_menukeyfn)(int key);
 
-extern int vid_hidden;
-extern int vid_activewindow;
-extern int vid_allowhwgamma;
-extern int vid_hardwaregammasupported;
-extern int vid_usinghwgamma;
+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_fullscreen;
 extern cvar_t vid_width;
 extern cvar_t vid_height;
 extern cvar_t vid_bitsperpixel;
+extern cvar_t vid_refreshrate;
+extern cvar_t vid_vsync;
 extern cvar_t vid_mouse;
-extern cvar_t vid_stencil;
+extern cvar_t vid_minwidth;
+extern cvar_t vid_minheight;
+
+extern cvar_t gl_combine;
+extern cvar_t gl_finish;
 
 extern cvar_t v_gamma;
 extern cvar_t v_contrast;
@@ -67,7 +71,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_overbrightbits;
 extern cvar_t v_hwgamma;
 
 extern int gl_stencil;
@@ -92,11 +95,9 @@ extern char gl_driver[256];
 extern qboolean isG200;
 extern qboolean isRagePro;
 
-// LordHavoc: GLX_SGI_video_sync and WGL_EXT_swap_control
+// LordHavoc: GLX_SGI_swap_control and WGL_EXT_swap_control
 extern int gl_videosyncavailable;
 
-int GL_OpenLibrary(const char *name);
-void GL_CloseLibrary(void);
 void *GL_GetProcAddress(const char *name);
 int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *disableparm, int silent);
 
@@ -116,24 +117,30 @@ int VID_SetMode (int modenum);
 // sets the mode; only used by the Quake engine for resetting to mode 0 (the
 // base mode) on memory allocation failures
 
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate);
+// allocates and opens an appropriate OpenGL context (and its window)
+
+
 // sets hardware gamma correction, returns false if the device does not
 // support gamma control
-int VID_SetGamma (unsigned short *ramps);
+// (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
-int VID_GetGamma (unsigned short *ramps);
-
-void VID_UpdateGamma(qboolean force);
+// (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
+// (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_GetWindowSize (int *x, int *y, int *width, int *height);
-
-void VID_Finish (void);
+void VID_Finish (qboolean allowmousegrab);
 
 void VID_Restart_f(void);
 
-void VID_Open (void);
-void VID_Close (void);
+void VID_Start(void);
 
 #endif