X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=vid.h;h=48fc9602d7089281ea495b3408ca89074cf7d607;hb=97cb39635544fc0a29036daacb31f6778f312f0d;hp=2280e2b84925ca80ad874c0a56c855576741a822;hpb=cd21cb3be9de4da3b2c1d2cb029352947b48166c;p=xonotic%2Fdarkplaces.git

diff --git a/vid.h b/vid.h
index 2280e2b8..48fc9602 100644
--- 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,18 +38,20 @@ 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 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 vid_stencil;
+
+extern cvar_t gl_combine;
+extern cvar_t gl_finish;
 
 extern cvar_t v_gamma;
 extern cvar_t v_contrast;
@@ -91,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);
 
@@ -120,6 +117,10 @@ 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);
+// 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);
@@ -130,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