X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=render.h;h=0fb84efcee384c986df7ccee004e1f3229e38fc2;hb=c0d54f21bcaba56302f5e9475b8182056f4841c0;hp=85e228504368b5c573379c202f76d9c45913c718;hpb=f07b58c9067a98df38dbf7f6dfb509979daa933c;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index 85e22850..0fb84efc 100644
--- 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;
 
@@ -306,7 +315,6 @@ typedef struct rsurfacestate_s
 	int ent_qwskin;
 	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;
@@ -316,6 +324,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;
@@ -323,8 +332,11 @@ typedef struct rsurfacestate_s
 	// colormapping state from entity (these are black if colormapping is off)
 	vec3_t colormap_pantscolor;
 	vec3_t colormap_shirtcolor;
+	// special coloring of ambient/diffuse textures (gloss not affected)
+	// colormod[3] is the alpha of the entity
+	float colormod[4];
 	// special coloring of glow textures
-	vec3_t glowmod;
+	float glowmod[3];
 	// view location in model space
 	vec3_t localvieworigin;
 	// polygon offset data for submodels
@@ -345,12 +357,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;
@@ -373,17 +379,18 @@ rsurfacestate_t;
 extern rsurfacestate_t rsurface;
 
 void RSurf_ActiveWorldEntity(void);
-void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents);
+void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents, qboolean prepass);
 void RSurf_ActiveCustomEntity(const matrix4x4_t *matrix, const matrix4x4_t *inversematrix, int entflags, double shadertime, float r, float g, float b, float a, int numvertices, const float *vertex3f, const float *texcoord2f, const float *normal3f, const float *svector3f, const float *tvector3f, const float *color4f, int numtriangles, const int *element3i, const unsigned short *element3s, qboolean wantnormals, qboolean wanttangents);
 void RSurf_SetupDepthAndCulling(void);
 
 void R_Mesh_ResizeArrays(int newvertices);
 
 texture_t *R_GetCurrentTexture(texture_t *t);
-void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug);
-void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug);
+void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug, qboolean prepass);
+void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug, qboolean prepass);
 void R_AddWaterPlanes(entity_render_t *ent);
-void R_DrawCustomSurface(skinframe_t *skinframe, const matrix4x4_t *texmatrix, int materialflags, int firstvertex, int numvertices, int firsttriangle, int numtriangles, qboolean writedepth);
+void R_DrawCustomSurface(skinframe_t *skinframe, const matrix4x4_t *texmatrix, int materialflags, int firstvertex, int numvertices, int firsttriangle, int numtriangles, qboolean writedepth, qboolean prepass);
+void R_DrawCustomSurface_Texture(texture_t *texture, const matrix4x4_t *texmatrix, int materialflags, int firstvertex, int numvertices, int firsttriangle, int numtriangles, qboolean writedepth, qboolean prepass);
 
 void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, const msurface_t **texturesurfacelist);
 void RSurf_DrawBatch_Simple(int texturenumsurfaces, const msurface_t **texturesurfacelist);
@@ -394,7 +401,8 @@ typedef enum rsurfacepass_e
 {
 	RSURFPASS_BASE,
 	RSURFPASS_BACKGROUND,
-	RSURFPASS_RTLIGHT
+	RSURFPASS_RTLIGHT,
+	RSURFPASS_DEFERREDGEOMETRY,
 }
 rsurfacepass_t;
 
@@ -435,15 +443,21 @@ typedef enum gl20_texunit_e
 	GL20TU_SHADOWMAPRECT = 11,
 	GL20TU_SHADOWMAPCUBE = 11,
 	GL20TU_SHADOWMAP2D = 11,
-	GL20TU_CUBEPROJECTION = 12
+	GL20TU_CUBEPROJECTION = 12,
+	// rtlight prepass data (screenspace depth and normalmap)
+	GL20TU_SCREENDEPTH = 13,
+	GL20TU_SCREENNORMALMAP = 14,
+	// lightmap prepass data (screenspace diffuse and specular from lights)
+	GL20TU_SCREENDIFFUSE = 11,
+	GL20TU_SCREENSPECULAR = 12,
 }
 gl20_texunit;
 
-void R_SetupGenericShader(qboolean usetexture);
-void R_SetupGenericTwoTextureShader(int texturemode);
-void R_SetupDepthOrShadowShader(void);
-void R_SetupShowDepthShader(void);
-void R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass);
+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);
+void R_SetupShader_DeferredLight(const rtlight_t *rtlight);
 
 typedef struct r_waterstate_waterplane_s
 {
@@ -451,13 +465,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;