break the net connection AFTER calling ClientDisconnect; this fixes issues with clien...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index af084a68b19e6a88dcfad12a75f0417819ab3810..ff691aac3014552a750ab3adc02807aabccdc30f 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -33,17 +33,18 @@ typedef enum renderpath_e
        RENDERPATH_GL11,
        RENDERPATH_GL13,
        RENDERPATH_GL20,
-       RENDERPATH_CGGL,
        RENDERPATH_D3D9,
        RENDERPATH_D3D10,
        RENDERPATH_D3D11,
-       RENDERPATH_SOFT
+       RENDERPATH_SOFT,
+       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;
@@ -66,6 +67,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;
 
@@ -97,8 +99,6 @@ typedef struct viddef_s
        int samples;
        qboolean stencil;
 
-       void *cgcontext;
-
        renderpath_t renderpath;
        qboolean forcevbo; // some renderpaths can not operate without it
        qboolean useinterleavedarrays; // required by some renderpaths
@@ -123,6 +123,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
@@ -136,6 +138,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;
@@ -146,6 +152,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;
@@ -246,5 +253,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