X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid.h;h=4840ae4a53451c476e45edaaa08e934e48df812d;hb=4991c4f792919b0035c2e35a915e27f37d8f56a0;hp=ff691aac3014552a750ab3adc02807aabccdc30f;hpb=6e35898f26d4755cde2bb8182c02de57e50dd028;p=xonotic%2Fdarkplaces.git

diff --git a/vid.h b/vid.h
index ff691aac..4840ae4a 100644
--- a/vid.h
+++ b/vid.h
@@ -37,6 +37,7 @@ typedef enum renderpath_e
 	RENDERPATH_D3D10,
 	RENDERPATH_D3D11,
 	RENDERPATH_SOFT,
+	RENDERPATH_GLES1,
 	RENDERPATH_GLES2
 }
 renderpath_t;
@@ -68,6 +69,7 @@ typedef struct viddef_support_s
 	qboolean ext_texture_edge_clamp;
 	qboolean ext_texture_filter_anisotropic;
 	qboolean ext_texture_srgb;
+	qboolean arb_multisample;
 }
 viddef_support_t;
 
@@ -98,10 +100,15 @@ typedef struct viddef_s
 	qboolean stereobuffer;
 	int samples;
 	qboolean stencil;
+	qboolean sRGB2D; // whether 2D rendering is sRGB corrected (based on sRGBcapable2D)
+	qboolean sRGB3D; // whether 3D rendering is sRGB corrected (based on sRGBcapable3D)
+	qboolean sRGBcapable2D; // whether 2D rendering can be sRGB corrected (renderpath, v_hwgamma)
+	qboolean sRGBcapable3D; // whether 3D rendering can be sRGB corrected (renderpath, v_hwgamma)
 
 	renderpath_t renderpath;
 	qboolean forcevbo; // some renderpaths can not operate without it
 	qboolean useinterleavedarrays; // required by some renderpaths
+	qboolean allowalphatocoverage; // indicates the GL_AlphaToCoverage function works on this renderpath and framebuffer
 
 	unsigned int texunits;
 	unsigned int teximageunits;
@@ -132,6 +139,33 @@ extern viddef_t vid;
 extern void (*vid_menudrawfn)(void);
 extern void (*vid_menukeyfn)(int key);
 
+#define MAXJOYAXIS 16
+// if this is changed, the corresponding code in vid_shared.c must be updated
+#define MAXJOYBUTTON 36
+typedef struct vid_joystate_s
+{
+	float axis[MAXJOYAXIS]; // -1 to +1
+	unsigned char button[MAXJOYBUTTON]; // 0 or 1
+	qboolean is360; // indicates this joystick is a Microsoft Xbox 360 Controller For Windows
+}
+vid_joystate_t;
+
+extern vid_joystate_t vid_joystate;
+
+extern cvar_t joy_index;
+extern cvar_t joy_enable;
+extern cvar_t joy_detected;
+extern cvar_t joy_active;
+
+float VID_JoyState_GetAxis(const vid_joystate_t *joystate, int axis, float sensitivity, float deadzone);
+void VID_ApplyJoyState(vid_joystate_t *joystate);
+void VID_BuildJoyState(vid_joystate_t *joystate);
+void VID_Shared_BuildJoyState_Begin(vid_joystate_t *joystate);
+void VID_Shared_BuildJoyState_Finish(vid_joystate_t *joystate);
+int VID_Shared_SetJoystick(int index);
+qboolean VID_JoyBlockEmulatedKeys(int keycode);
+void VID_EnableJoystick(qboolean enable);
+
 extern qboolean vid_hidden;
 extern qboolean vid_activewindow;
 extern cvar_t vid_hardwaregammasupported;