Fix a possible crash when an invalid skinframe gets accessed after cl.time steps...

[xonotic/darkplaces.git] / vid.h

diff --git a/vid.h b/vid.h
index b0c3b6269e8e854f8f525f41dee7c61863325aac..343e8f1815f71a92c3f3301e7d3c5fe104bdacba 100644 (file)
--- a/vid.h
+++ b/vid.h
@@ -34,6 +34,9 @@ typedef enum renderpath_e
        RENDERPATH_GL13,
        RENDERPATH_GL20,
        RENDERPATH_CGGL,
+       RENDERPATH_D3D9,
+       RENDERPATH_D3D10,
+       RENDERPATH_D3D11
 }
 renderpath_t;
 
@@ -53,13 +56,11 @@ typedef struct viddef_support_s
        qboolean arb_texture_env_combine;
        qboolean arb_texture_gather;
        qboolean arb_texture_non_power_of_two;
-       qboolean arb_texture_rectangle;
        qboolean arb_vertex_buffer_object;
        qboolean arb_vertex_shader;
        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;
@@ -101,6 +102,7 @@ typedef struct viddef_s
        void *cgcontext;
 
        renderpath_t renderpath;
+       qboolean forcevbo; // some renderpaths can not operate without it
 
        unsigned int texunits;
        unsigned int teximageunits;
@@ -111,7 +113,6 @@ typedef struct viddef_s
        unsigned int maxtexturesize_2d;
        unsigned int maxtexturesize_3d;
        unsigned int maxtexturesize_cubemap;
-       unsigned int maxtexturesize_rectangle;
        unsigned int max_anisotropy;
        unsigned int maxdrawbuffers;
 
@@ -182,12 +183,13 @@ 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);
 
 void GL_Init (void);
 
+void VID_ClearExtensions(void);
 void VID_CheckExtensions(void);
 
 void VID_Init (void);