use size_t even more

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 3c845043275a4549d0bfc5356b5570530f3f82ef..48fc9602d7089281ea495b3408ca89074cf7d607 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -26,14 +26,11 @@ extern int cl_available;
 
 typedef struct
 {
-       // 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;
 } viddef_t;
 
 // global video state
@@ -41,17 +38,21 @@ extern viddef_t vid;
 extern void (*vid_menudrawfn)(void);
 extern void (*vid_menukeyfn)(int key);
 
-extern int vid_hidden;
-extern int vid_activewindow;
+extern qboolean vid_hidden;
+extern qboolean vid_activewindow;
 extern cvar_t vid_hardwaregammasupported;
-extern int vid_usinghwgamma;
+extern qboolean vid_usinghwgamma;
 
 extern cvar_t vid_fullscreen;
 extern cvar_t vid_width;
 extern cvar_t vid_height;
 extern cvar_t vid_bitsperpixel;
+extern cvar_t vid_vsync;
 extern cvar_t vid_mouse;
 
+extern cvar_t gl_combine;
+extern cvar_t gl_finish;
+
 extern cvar_t v_gamma;
 extern cvar_t v_contrast;
 extern cvar_t v_brightness;
@@ -89,11 +90,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);
 
@@ -132,14 +131,11 @@ int VID_GetGamma (unsigned short *ramps);
 void VID_UpdateGamma(qboolean force);
 void VID_RestoreSystemGamma(void);
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height);
-
 void VID_Finish (void);
 
 void VID_Restart_f(void);
 
-void VID_Open (void);
-void VID_Close (void);
+void VID_Start(void);
 
 #endif