added vid_sRGB cvar, this replaces the r_texture_sRGB* cvars and

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 2ef6c80ed7c7479251e5758f84625c7774ac01af..6c42deba1fae61048571c0b4555a43b275acf7bb 100644 (file)
--- 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;
@@ -44,6 +45,7 @@ renderpath_t;
 typedef struct viddef_support_s
 {
        qboolean gl20shaders;
+       qboolean gl20shaders130;
        qboolean amd_texture_texture4;
        qboolean arb_depth_texture;
        qboolean arb_draw_buffers;
@@ -66,6 +68,7 @@ typedef struct viddef_support_s
        qboolean ext_texture_compression_s3tc;
        qboolean ext_texture_edge_clamp;
        qboolean ext_texture_filter_anisotropic;
+       qboolean ext_texture_srgb;
 }
 viddef_support_t;
 
@@ -96,6 +99,10 @@ 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
@@ -121,6 +128,8 @@ typedef struct viddef_s
        //  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
@@ -134,6 +143,10 @@ 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;
@@ -245,5 +258,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