X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid.h;h=4840ae4a53451c476e45edaaa08e934e48df812d;hp=b0c3b6269e8e854f8f525f41dee7c61863325aac;hb=57d7496c097df506f385c4a301173e7576c987c7;hpb=f7e4a38d4ed39b94ae86820b28867171fcede2af

diff --git a/vid.h b/vid.h
index b0c3b626..4840ae4a 100644
--- a/vid.h
+++ b/vid.h
@@ -33,33 +33,34 @@ typedef enum renderpath_e
 	RENDERPATH_GL11,
 	RENDERPATH_GL13,
 	RENDERPATH_GL20,
-	RENDERPATH_CGGL,
+	RENDERPATH_D3D9,
+	RENDERPATH_D3D10,
+	RENDERPATH_D3D11,
+	RENDERPATH_SOFT,
+	RENDERPATH_GLES1,
+	RENDERPATH_GLES2
 }
 renderpath_t;
 
 typedef struct viddef_support_s
 {
+	qboolean gl20shaders;
+	qboolean gl20shaders130;
 	qboolean amd_texture_texture4;
 	qboolean arb_depth_texture;
 	qboolean arb_draw_buffers;
-	qboolean arb_fragment_shader;
 	qboolean arb_multitexture;
 	qboolean arb_occlusion_query;
-	qboolean arb_shader_objects;
-	qboolean arb_shading_language_100;
 	qboolean arb_shadow;
 	qboolean arb_texture_compression;
 	qboolean arb_texture_cube_map;
 	qboolean arb_texture_env_combine;
 	qboolean arb_texture_gather;
 	qboolean arb_texture_non_power_of_two;
-	qboolean arb_texture_rectangle;
 	qboolean arb_vertex_buffer_object;
-	qboolean arb_vertex_shader;
 	qboolean ati_separate_stencil;
 	qboolean ext_blend_minmax;
 	qboolean ext_blend_subtract;
-	qboolean ext_compiled_vertex_array;
 	qboolean ext_draw_range_elements;
 	qboolean ext_framebuffer_object;
 	qboolean ext_stencil_two_side;
@@ -67,6 +68,8 @@ typedef struct viddef_support_s
 	qboolean ext_texture_compression_s3tc;
 	qboolean ext_texture_edge_clamp;
 	qboolean ext_texture_filter_anisotropic;
+	qboolean ext_texture_srgb;
+	qboolean arb_multisample;
 }
 viddef_support_t;
 
@@ -97,10 +100,15 @@ typedef struct viddef_s
 	qboolean stereobuffer;
 	int samples;
 	qboolean stencil;
-
-	void *cgcontext;
+	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;
@@ -111,11 +119,19 @@ typedef struct viddef_s
 	unsigned int maxtexturesize_2d;
 	unsigned int maxtexturesize_3d;
 	unsigned int maxtexturesize_cubemap;
-	unsigned int maxtexturesize_rectangle;
 	unsigned int max_anisotropy;
 	unsigned int maxdrawbuffers;
 
 	viddef_support_t support;
+
+	// in RENDERPATH_SOFT this is a 32bpp native-endian ARGB framebuffer
+	// (native-endian ARGB meaning that in little endian it is BGRA bytes,
+	//  in big endian it is ARGB byte order, the format is converted during
+	//  blit to the window)
+	unsigned int *softpixels;
+	unsigned int *softdepthpixels;
+
+	int forcetextype; // always use GL_BGRA for D3D, always use GL_RGBA for GLES, etc
 } viddef_t;
 
 // global video state
@@ -123,12 +139,43 @@ 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;
 extern qboolean vid_usinghwgamma;
 extern qboolean vid_supportrefreshrate;
 
+extern cvar_t vid_soft;
+extern cvar_t vid_soft_threads;
+extern cvar_t vid_soft_interlace;
+
 extern cvar_t vid_fullscreen;
 extern cvar_t vid_width;
 extern cvar_t vid_height;
@@ -139,6 +186,7 @@ extern cvar_t vid_userefreshrate;
 extern cvar_t vid_vsync;
 extern cvar_t vid_mouse;
 extern cvar_t vid_grabkeyboard;
+extern cvar_t vid_touchscreen;
 extern cvar_t vid_stick_mouse;
 extern cvar_t vid_resizable;
 extern cvar_t vid_minwidth;
@@ -182,12 +230,13 @@ extern qboolean isG200;
 extern qboolean isRagePro;
 
 void *GL_GetProcAddress(const char *name);
-int GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, const char *disableparm, int silent);
+qboolean GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, const char *disableparm, int silent);
 
 void VID_Shared_Init(void);
 
 void GL_Init (void);
 
+void VID_ClearExtensions(void);
 void VID_CheckExtensions(void);
 
 void VID_Init (void);
@@ -238,5 +287,6 @@ typedef struct
 vid_mode_t;
 size_t VID_ListModes(vid_mode_t *modes, size_t maxcount);
 size_t VID_SortModes(vid_mode_t *modes, size_t count, qboolean usebpp, qboolean userefreshrate, qboolean useaspect);
+void VID_Soft_SharedSetup(void);
 #endif