R_LightPoint: fix glitch. Add checking for worldmodel->lit to R_LightPoint and R_Comp...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index 157f1c0b9767c73ebd38c0dc9f0910dd39bc197f..aca91a1eed8dd247e415393d993c55e30a9c3a04 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;
 
@@ -121,6 +124,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 +139,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;
@@ -144,6 +153,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;
@@ -244,5 +254,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