remove a dead prototype

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 2d0b9925da5e72aac15a9719fa42c7785376ff55..af999c388ae42efb38401ef6e14d766607a1d72e 100644 (file)
--- a/render.h
+++ b/render.h
@@ -45,7 +45,6 @@ extern void SHOWLMP_decodeshow(void);
 extern void SHOWLMP_drawall(void);
 
 // render profiling stuff
-extern char r_speeds_string[1024];
 extern int r_timereport_active;
 
 // lighting stuff
@@ -57,6 +56,7 @@ extern cvar_t r_novis;
 
 extern cvar_t r_lerpsprites;
 extern cvar_t r_lerpmodels;
+extern cvar_t r_lerplightstyles;
 extern cvar_t r_waterscroll;
 
 extern cvar_t developer_texturelogging;
@@ -125,8 +125,6 @@ void R_UpdateVariables(void); // must call after setting up most of r_refdef, bu
 void R_RenderView(void); // must set r_refdef and call R_UpdateVariables first
 
 
-void R_InitSky (unsigned char *src, int bytesperpixel); // called at level load
-
 void R_SkinFrame_PrepareForPurge(void);
 void R_SkinFrame_MarkUsed(skinframe_t *skinframe);
 void R_SkinFrame_Purge(void);
@@ -174,8 +172,6 @@ extern cvar_t r_test;
 
 #include "gl_backend.h"
 
-#include "r_light.h"
-
 extern rtexture_t *r_texture_blanknormalmap;
 extern rtexture_t *r_texture_white;
 extern rtexture_t *r_texture_grey128;
@@ -309,6 +305,9 @@ typedef struct rsurfacestate_s
        vec3_t colormap_shirtcolor;
        // view location in model space
        vec3_t modelorg; // TODO: rename this
+       // polygon offset data for submodels
+       float basepolygonfactor;
+       float basepolygonoffset;
        // current texture in batching code
        texture_t *texture;
        // whether lightmapping is active on this batch
@@ -345,6 +344,7 @@ extern rsurfacestate_t rsurface;
 void RSurf_ActiveWorldEntity(void);
 void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents);
 void RSurf_CleanUp(void);
+void RSurf_SetupDepthAndCulling(void);
 
 void R_Mesh_ResizeArrays(int newvertices);
 
@@ -368,6 +368,28 @@ typedef enum rsurfacepass_e
 }
 rsurfacepass_t;
 
+typedef enum gl20_texunit_e
+{
+       GL20TU_NORMAL = 0,
+       GL20TU_COLOR = 1,
+       GL20TU_GLOSS = 2,
+       GL20TU_GLOW = 3,
+       GL20TU_SECONDARY_NORMAL = 4,
+       GL20TU_SECONDARY_COLOR = 5,
+       GL20TU_SECONDARY_GLOSS = 6,
+       GL20TU_SECONDARY_GLOW = 7,
+       GL20TU_PANTS = 8,
+       GL20TU_SHIRT = 9,
+       GL20TU_FOGMASK = 10,
+       GL20TU_LIGHTMAP = 11,
+       GL20TU_DELUXEMAP = 12,
+       GL20TU_REFRACTION = 13,
+       GL20TU_REFLECTION = 14,
+       GL20TU_ATTENUATION = 3,
+       GL20TU_CUBE = 13,
+}
+gl20_texunit;
+
 int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t pass);
 
 #endif