Removed the gray-out behavior on the gamma settings in the color control menu when...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 6d30a039bca5252f6f1fce024eec673008b95d4a..73999c4880a6557715e73b004d47b3698ad5d89c 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -46,13 +46,14 @@ typedef struct viddef_support_s
 {
        qboolean gl20shaders;
        qboolean gl20shaders130; // indicates glBindFragDataLocation is available
-       qboolean glshaderversion; // typical values: 100 110 120 130 140 ...
+       int glshaderversion; // typical values: 100 110 120 130 140 ...
        qboolean amd_texture_texture4;
        qboolean arb_depth_texture;
        qboolean arb_draw_buffers;
        qboolean arb_framebuffer_object;
        qboolean arb_multitexture;
        qboolean arb_occlusion_query;
+       qboolean arb_query_buffer_object;
        qboolean arb_shadow;
        qboolean arb_texture_compression;
        qboolean arb_texture_cube_map;
@@ -64,6 +65,7 @@ typedef struct viddef_support_s
        qboolean ati_separate_stencil;
        qboolean ext_blend_minmax;
        qboolean ext_blend_subtract;
+       qboolean ext_blend_func_separate;
        qboolean ext_draw_range_elements;
        qboolean ext_framebuffer_object;
        qboolean ext_packed_depth_stencil;
@@ -73,6 +75,9 @@ typedef struct viddef_support_s
        qboolean ext_texture_edge_clamp;
        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;
 }
 viddef_support_t;
@@ -187,12 +192,18 @@ extern cvar_t vid_bitsperpixel;
 extern cvar_t vid_samples;
 extern cvar_t vid_refreshrate;
 extern cvar_t vid_userefreshrate;
+extern cvar_t vid_touchscreen_density;
+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_grabkeyboard;
 extern cvar_t vid_touchscreen;
+extern cvar_t vid_touchscreen_showkeyboard;
+extern cvar_t vid_touchscreen_supportshowkeyboard;
 extern cvar_t vid_stick_mouse;
 extern cvar_t vid_resizable;
+extern cvar_t vid_desktopfullscreen;
 extern cvar_t vid_minwidth;
 extern cvar_t vid_minheight;
 extern cvar_t vid_sRGB;
@@ -270,6 +281,10 @@ void VID_UpdateGamma(qboolean force, int rampsize);
 // (called from various shutdown/deactivation functions)
 void VID_RestoreSystemGamma(void);
 
+qboolean VID_HasScreenKeyboardSupport(void);
+void VID_ShowKeyboard(qboolean show);
+qboolean VID_ShowingKeyboard(void);
+
 void VID_SetMouse (qboolean fullscreengrab, qboolean relative, qboolean hidecursor);
 void VID_Finish (void);
 
@@ -281,6 +296,7 @@ void VID_Stop(void);
 extern unsigned int vid_gammatables_serial; // so other subsystems can poll if gamma parameters have changed; this starts with 0 and gets increased by 1 each time the gamma parameters get changed and VID_BuildGammaTables should be called again
 extern qboolean vid_gammatables_trivial; // this is set to true if all color control values are at default setting, and it therefore would make no sense to use the gamma table
 void VID_BuildGammaTables(unsigned short *ramps, int rampsize); // builds the current gamma tables into an array (needs 3*rampsize items)
+void VID_ApplyGammaToColor(const float *rgb, float *out); // applies current gamma settings to a color (0-1 range)
 
 typedef struct
 {
@@ -288,6 +304,7 @@ typedef struct
        int pixelheight_num, pixelheight_denom;
 }
 vid_mode_t;
+vid_mode_t *VID_GetDesktopMode(void);
 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);