reenabled R_UpdateAllTextureInfo calls when lighting the world model

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 14dd7746f419b35cb4bb6f1950543533839070a2..49d3c3620aa4a2f1e203a11f78f90bf0e948b8be 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
@@ -175,8 +174,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;
@@ -310,6 +307,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
@@ -346,6 +346,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);