X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid.h;h=2199ea0b6bc98eb34722b15e373080e43572f24e;hb=27b8e67dec8c8084ba38ed8201dc54ccd46fdb23;hp=e1b14ef1b9956438a8c5e56831ee4a3a5199638b;hpb=33fb1d11372ce3b1beab0407015535247d6bff14;p=xonotic%2Fdarkplaces.git

diff --git a/vid.h b/vid.h
index e1b14ef1..2199ea0b 100644
--- a/vid.h
+++ b/vid.h
@@ -37,25 +37,13 @@ renderpath_t;
 
 typedef struct viddef_support_s
 {
-	qboolean gl20shaders130; // indicates glBindFragDataLocation is available
-	int glshaderversion; // typical values: 100 110 120 130 140 ...
+	int glshaderversion; // this is at least 150 (GL 3.2)
 	qboolean amd_texture_texture4;
-	qboolean arb_draw_buffers;
-	qboolean arb_occlusion_query;
-	qboolean arb_query_buffer_object;
-	qboolean arb_texture_compression;
 	qboolean arb_texture_gather;
-	qboolean ext_blend_minmax;
-	qboolean ext_blend_subtract;
-	qboolean ext_blend_func_separate;
-	qboolean ext_packed_depth_stencil;
 	qboolean ext_texture_compression_s3tc;
 	qboolean ext_texture_filter_anisotropic;
 	qboolean ext_texture_srgb;
-	qboolean arb_texture_float;
-	qboolean arb_half_float_pixel;
-	qboolean arb_half_float_vertex;
-	qboolean arb_multisample;
+	qboolean arb_debug_output;
 }
 viddef_support_t;
 
@@ -94,9 +82,6 @@ typedef struct viddef_s
 	renderpath_t renderpath;
 	qboolean allowalphatocoverage; // indicates the GL_AlphaToCoverage function works on this renderpath and framebuffer
 
-	unsigned int drawrangeelements_maxvertices;
-	unsigned int drawrangeelements_maxindices;
-
 	unsigned int maxtexturesize_2d;
 	unsigned int maxtexturesize_3d;
 	unsigned int maxtexturesize_cubemap;
@@ -145,6 +130,7 @@ extern qboolean vid_activewindow;
 extern qboolean vid_supportrefreshrate;
 
 extern cvar_t vid_fullscreen;
+extern cvar_t vid_borderless;
 extern cvar_t vid_width;
 extern cvar_t vid_height;
 extern cvar_t vid_bitsperpixel;
@@ -156,6 +142,7 @@ extern cvar_t vid_touchscreen_xdpi;
 extern cvar_t vid_touchscreen_ydpi;
 extern cvar_t vid_vsync;
 extern cvar_t vid_mouse;
+extern cvar_t vid_mouse_clickthrough;
 extern cvar_t vid_grabkeyboard;
 extern cvar_t vid_touchscreen;
 extern cvar_t vid_touchscreen_showkeyboard;
@@ -163,6 +150,9 @@ extern cvar_t vid_touchscreen_supportshowkeyboard;
 extern cvar_t vid_stick_mouse;
 extern cvar_t vid_resizable;
 extern cvar_t vid_desktopfullscreen;
+#ifdef WIN32
+extern cvar_t vid_ignore_taskbar;
+#endif
 extern cvar_t vid_minwidth;
 extern cvar_t vid_minheight;
 extern cvar_t vid_sRGB;
@@ -194,21 +184,18 @@ extern const char *gl_version;
 extern const char *gl_extensions;
 // WGL, GLX, or AGL
 extern const char *gl_platform;
-// another extensions list, containing platform-specific extensions that are
-// not in the main list
-extern const char *gl_platformextensions;
 // name of driver library (opengl32.dll, libGL.so.1, or whatever)
 extern char gl_driver[256];
 
 void *GL_GetProcAddress(const char *name);
-qboolean GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, const char *disableparm, int silent);
+qboolean GL_CheckExtension(const char *name, const char *disableparm, int silent);
+qboolean GL_ExtensionSupported(const char *name);
 
 void VID_Shared_Init(void);
 
-void GL_Init (void);
+void GL_Setup(void);
 
 void VID_ClearExtensions(void);
-void VID_CheckExtensions(void);
 
 void VID_Init (void);
 // Called at startup
@@ -235,7 +222,7 @@ qboolean VID_ShowingKeyboard(void);
 void VID_SetMouse (qboolean fullscreengrab, qboolean relative, qboolean hidecursor);
 void VID_Finish (void);
 
-void VID_Restart_f(void);
+void VID_Restart_f(cmd_state_t *cmd);
 
 void VID_Start(void);
 void VID_Stop(void);