X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid.h;h=48fc9602d7089281ea495b3408ca89074cf7d607;hb=3d19b4fbe87586e1a28e4af52f11d637ee389e18;hp=f3da2f4289b1ab064f672daa9027738be4ba66bc;hpb=b82d346b06f2dbd3d4fff3ef6b7ad986739d6cf7;p=xonotic%2Fdarkplaces.git

diff --git a/vid.h b/vid.h
index f3da2f42..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,15 +38,38 @@ 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 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;
+extern cvar_t v_color_enable;
+extern cvar_t v_color_black_r;
+extern cvar_t v_color_black_g;
+extern cvar_t v_color_black_b;
+extern cvar_t v_color_grey_r;
+extern cvar_t v_color_grey_g;
+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;
+
+extern int gl_stencil;
+
 // brand of graphics chip
 extern const char *gl_vendor;
 // graphics chip model and other information
@@ -70,39 +90,24 @@ 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;
 
-typedef struct
-{
-	const char *name;
-	void **funcvariable;
-}
-gl_extensionfunctionlist_t;
-
-typedef struct
-{
-	const char *name;
-	const gl_extensionfunctionlist_t *funcs;
-	int *enablevariable;
-	const char *disableparm;
-}
-gl_extensioninfo_t;
-
-int GL_OpenLibrary(const char *name);
-void GL_CloseLibrary(void);
 void *GL_GetProcAddress(const char *name);
-int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent);
+int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *disableparm, int silent);
 
-double VID_CompareMode(int width1, int height1, int bpp1, int width2, int height2, int bpp2);
+// this attempts to use vendor extensions to allocate faster vertex memory if
+// the fast parameter is true, if unsuccessful it uses Mem_Alloc instead
+void *VID_AllocVertexArrays(mempool_t *pool, int size, int fast, float readfrequency, float writefrequency, float priority);
+void VID_FreeVertexArrays(void *pointer);
 
-void VID_InitCvars(void);
+void VID_Shared_Init(void);
 
 void GL_Init (void);
 
 void VID_CheckExtensions(void);
 
-void VID_Init (int fullscreen, int width, int height);
+void VID_Init (void);
 // Called at startup
 
 void VID_Shutdown (void);
@@ -112,13 +117,25 @@ 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 (float prescale, float gamma, float scale, float base);
+int VID_SetGamma (unsigned short *ramps);
+// gets hardware gamma correction, returns false if the device does not
+// support gamma control
+int VID_GetGamma (unsigned short *ramps);
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height);
+void VID_UpdateGamma(qboolean force);
+void VID_RestoreSystemGamma(void);
 
 void VID_Finish (void);
 
+void VID_Restart_f(void);
+
+void VID_Start(void);
+
 #endif