Consolidate FS_Init and associated code

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index ef20c14a2bc97fb983c016c0a53dc9c7009f5351..2367fbfe336072ed6d0baf272893fd7080ec8f50 100644 (file)
--- a/render.h
+++ b/render.h
@@ -58,6 +58,7 @@ typedef enum shadermode_e
        SHADERMODE_LIGHTDIRECTIONMAP_TANGENTSPACE, ///< (lightmap) use directional pixel shading from texture containing tangentspace light directions (q1bsp deluxemap)
        SHADERMODE_LIGHTDIRECTIONMAP_FORCED_LIGHTMAP, // forced deluxemapping for lightmapped surfaces
        SHADERMODE_LIGHTDIRECTIONMAP_FORCED_VERTEXCOLOR, // forced deluxemapping for vertexlit surfaces
+       SHADERMODE_LIGHTGRID, ///< (lightmap) use directional pixel shading from lightgrid data (q3bsp)
        SHADERMODE_LIGHTDIRECTION, ///< (lightmap) use directional pixel shading from fixed light direction (q3bsp)
        SHADERMODE_LIGHTSOURCE, ///< (lightsource) use directional pixel shading from light source (rtlight)
        SHADERMODE_REFRACTION, ///< refract background (the material is rendered normally after this pass)
@@ -294,8 +295,6 @@ qboolean R_AnimCache_GetEntity(entity_render_t *ent, qboolean wantnormals, qbool
 /// generate animcache data for all entities marked visible
 void R_AnimCache_CacheVisibleEntities(void);
 
-#include "r_lerpanim.h"
-
 extern cvar_t r_render;
 extern cvar_t r_renderview;
 extern cvar_t r_waterwarp;
@@ -585,9 +584,9 @@ typedef struct r_rendertarget_s {
        // but potentially faster)
        rtexture_t *colortexture[4];
        rtexture_t *depthtexture;
-       // a rendertarget will not be reused in the same frame (realtime == lastusetime),
+       // a rendertarget will not be reused in the same frame (host.realtime == lastusetime),
        // on a new frame, matching rendertargets will be reused (texturewidth, textureheight, number of color and depth textures and their types),
-       // when a new frame arrives the rendertargets can be reused by requests for matching texturewidth,textureheight and fbo configuration (the number of color and depth textures), when a rendertarget is not reused for > 200ms (realtime - lastusetime > 0.2) the rendertarget's resources will be freed (fbo, textures) and it can be reused for any target in future frames
+       // when a new frame arrives the rendertargets can be reused by requests for matching texturewidth,textureheight and fbo configuration (the number of color and depth textures), when a rendertarget is not reused for > 200ms (host.realtime - lastusetime > 0.2) the rendertarget's resources will be freed (fbo, textures) and it can be reused for any target in future frames
        double lastusetime;
 } r_rendertarget_t;