fix a bunch of warnings if compiling darkplaces as C++ in MSVC2008

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index f0b8146f618be6d71a1a7781b6d2b4e2acf62074..540a0c429286cc1923ac1610937b8ed3822b3c0d 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -33,6 +33,7 @@ typedef enum renderpath_e
        RENDERPATH_GL11,
        RENDERPATH_GL13,
        RENDERPATH_GL20,
+       RENDERPATH_CGGL,
 }
 renderpath_t;
 
@@ -40,6 +41,7 @@ typedef struct viddef_support_s
 {
        qboolean amd_texture_texture4;
        qboolean arb_depth_texture;
+       qboolean arb_draw_buffers;
        qboolean arb_fragment_shader;
        qboolean arb_multitexture;
        qboolean arb_occlusion_query;
@@ -49,7 +51,6 @@ typedef struct viddef_support_s
        qboolean arb_texture_compression;
        qboolean arb_texture_cube_map;
        qboolean arb_texture_env_combine;
-       qboolean arb_texture_env_dot3;
        qboolean arb_texture_gather;
        qboolean arb_texture_non_power_of_two;
        qboolean arb_texture_rectangle;
@@ -58,14 +59,13 @@ typedef struct viddef_support_s
        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;
        qboolean ext_texture_3d;
+       qboolean ext_texture_compression_s3tc;
        qboolean ext_texture_edge_clamp;
        qboolean ext_texture_filter_anisotropic;
-       qboolean nv_blend_square;
 }
 viddef_support_t;
 
@@ -97,7 +97,10 @@ typedef struct viddef_s
        int samples;
        qboolean stencil;
 
+       void *cgcontext;
+
        renderpath_t renderpath;
+       qboolean forcevbo; // some renderpaths can not operate without it
 
        unsigned int texunits;
        unsigned int teximageunits;
@@ -110,6 +113,7 @@ typedef struct viddef_s
        unsigned int maxtexturesize_cubemap;
        unsigned int maxtexturesize_rectangle;
        unsigned int max_anisotropy;
+       unsigned int maxdrawbuffers;
 
        viddef_support_t support;
 } viddef_t;
@@ -140,7 +144,6 @@ extern cvar_t vid_resizable;
 extern cvar_t vid_minwidth;
 extern cvar_t vid_minheight;
 
-extern cvar_t gl_combine;
 extern cvar_t gl_finish;
 
 extern cvar_t v_gamma;
@@ -179,7 +182,7 @@ 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);