don't spam warnings about bogus frame numbers in states, because FvF

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index d81cc5656b55ed56716f7d8106a8b975728b00dc..6115f5bc0cecdeb7169e30076ad68f9e2420e0d5 100644 (file)
--- a/render.h
+++ b/render.h
@@ -220,7 +220,7 @@ extern unsigned int r_queries[MAX_OCCLUSION_QUERIES];
 extern unsigned int r_numqueries;
 extern unsigned int r_maxqueries;
 
-void R_TimeReport(char *name);
+void R_TimeReport(const char *name);
 
 // r_stain
 void R_Stain(const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2);
@@ -462,7 +462,7 @@ typedef enum rsurfacepass_e
        RSURFPASS_BASE,
        RSURFPASS_BACKGROUND,
        RSURFPASS_RTLIGHT,
-       RSURFPASS_DEFERREDGEOMETRY,
+       RSURFPASS_DEFERREDGEOMETRY
 }
 rsurfacepass_t;
 
@@ -500,13 +500,8 @@ typedef enum gl20_texunit_e
        // conflicts with lightmap/deluxemap
        GL20TU_ATTENUATION = 9,
        GL20TU_CUBE = 10,
-       GL20TU_SHADOWMAPRECT = 11,
-       GL20TU_SHADOWMAPCUBE = 11,
-       GL20TU_SHADOWMAP2D = 11,
+       GL20TU_SHADOWMAP2D = 15,
        GL20TU_CUBEPROJECTION = 12,
-       // orthographic-projection shadowmapping
-       GL20TU_SHADOWMAPORTHORECT = 15,
-       GL20TU_SHADOWMAPORTHO2D = 15,
        // rtlight prepass data (screenspace depth and normalmap)
        GL20TU_SCREENDEPTH = 13,
        GL20TU_SCREENNORMALMAP = 14,
@@ -523,7 +518,7 @@ gl20_texunit;
 void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemode, int rgbscale);
 void R_SetupShader_DepthOrShadow(void);
 void R_SetupShader_ShowDepth(void);
-void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist);
+void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane);
 void R_SetupShader_DeferredLight(const rtlight_t *rtlight);
 
 typedef struct r_waterstate_waterplane_s
@@ -536,6 +531,7 @@ typedef struct r_waterstate_waterplane_s
        unsigned char pvsbits[(MAX_MAP_LEAFS+7)>>3]; // FIXME: buffer overflow on huge maps
        qboolean pvsvalid;
        int camera_entity;
+       vec3_t mins, maxs;
 }
 r_waterstate_waterplane_t;