added R_FrameData_Alloc and Store functions (a per-frame heap allocator

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 1bcee791e591a2b05d44ac280499e85f90fc7e40..d212f48e683506ddcc48459edff55372c35a4a5d 100644 (file)
--- a/render.h
+++ b/render.h
@@ -140,7 +140,6 @@ void R_SkinFrame_Purge(void);
 skinframe_t *R_SkinFrame_FindNextByName( skinframe_t *last, const char *name );
 skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewidth, int compareheight, int comparecrc, qboolean add);
 skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboolean complain);
-skinframe_t *R_SkinFrame_LoadExternal_CheckAlpha(const char *name, int textureflags, qboolean complain, qboolean *has_alpha);
 skinframe_t *R_SkinFrame_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadInternalQuake(const char *name, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadInternal8bit(const char *name, int textureflags, const unsigned char *skindata, int width, int height, const unsigned int *palette, const unsigned int *alphapalette);
@@ -161,6 +160,17 @@ int R_CullBoxCustomPlanes(const vec3_t mins, const vec3_t maxs, int numplanes, c
 
 #include "meshqueue.h"
 
+extern qboolean r_framedata_failed;
+void R_FrameData_Reset(void);
+void R_FrameData_NewFrame(void);
+void *R_FrameData_Alloc(size_t size);
+void *R_FrameData_Store(size_t size, void *data);
+
+void R_AnimCache_Free(void);
+void R_AnimCache_ClearCache(void);
+qboolean R_AnimCache_GetEntity(entity_render_t *ent, qboolean wantnormals, qboolean wanttangents);
+void R_AnimCache_CacheVisibleEntities(void);
+
 #include "r_lerpanim.h"
 
 extern cvar_t r_render;
@@ -168,7 +178,7 @@ extern cvar_t r_renderview;
 extern cvar_t r_waterwarp;
 
 extern cvar_t r_textureunits;
-extern cvar_t r_glsl;
+
 extern cvar_t r_glsl_offsetmapping;
 extern cvar_t r_glsl_offsetmapping_reliefmapping;
 extern cvar_t r_glsl_offsetmapping_scale;
@@ -195,8 +205,7 @@ extern rtexture_t *r_texture_normalizationcube;
 extern rtexture_t *r_texture_fogattenuation;
 //extern rtexture_t *r_texture_fogintensity;
 
-#define R_MAX_OCCLUSION_QUERIES 4096
-extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES];
+extern unsigned int r_queries[MAX_OCCLUSION_QUERIES];
 extern unsigned int r_numqueries;
 extern unsigned int r_maxqueries;
 
@@ -307,6 +316,7 @@ typedef struct rsurfacestate_s
        int ent_flags;
        float ent_shadertime;
        float ent_color[4];
+       int ent_alttextures; // used by q1bsp animated textures (pressed buttons)
        // transform matrices to render this entity and effects on this entity
        matrix4x4_t matrix;
        matrix4x4_t inversematrix;
@@ -315,6 +325,7 @@ typedef struct rsurfacestate_s
        float inversematrixscale;
        // animation blending state from entity
        frameblend_t frameblend[MAX_FRAMEBLENDS];
+       skeleton_t *skeleton;
        // directional model shading state from entity
        vec3_t modellight_ambient;
        vec3_t modellight_diffuse;
@@ -344,12 +355,6 @@ typedef struct rsurfacestate_s
        // rtlight rendering
        // light currently being rendered
        const rtlight_t *rtlight;
-       // current light's cull box (copied out of an rtlight or calculated by GetLightInfo)
-       vec3_t rtlight_cullmins;
-       vec3_t rtlight_cullmaxs;
-       // current light's culling planes
-       int rtlight_numfrustumplanes;
-       mplane_t rtlight_frustumplanes[12+6+6]; // see R_Shadow_ComputeShadowCasterCullingPlanes
 
        // this is the location of the light in entity space
        vec3_t entitylightorigin;
@@ -387,6 +392,8 @@ void R_DrawCustomSurface(skinframe_t *skinframe, const matrix4x4_t *texmatrix, i
 void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, const msurface_t **texturesurfacelist);
 void RSurf_DrawBatch_Simple(int texturenumsurfaces, const msurface_t **texturesurfacelist);
 
+void R_DecalSystem_SplatEntities(const vec3_t org, const vec3_t normal, float r, float g, float b, float a, float s1, float t1, float s2, float t2, float size);
+
 typedef enum rsurfacepass_e
 {
        RSURFPASS_BASE,
@@ -448,13 +455,11 @@ typedef struct r_waterstate_waterplane_s
        rtexture_t *texture_reflection;
        mplane_t plane;
        int materialflags; // combined flags of all water surfaces on this plane
-       unsigned char pvsbits[(32768+7)>>3]; // FIXME: buffer overflow on huge maps
+       unsigned char pvsbits[(MAX_MAP_LEAFS+7)>>3]; // FIXME: buffer overflow on huge maps
        qboolean pvsvalid;
 }
 r_waterstate_waterplane_t;
 
-#define MAX_WATERPLANES 16
-
 typedef struct r_waterstate_s
 {
        qboolean enabled;