X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=render.h;h=79b1198bbf74dd88769bd1bf12cbd4cd39db4662;hb=047d1c8e5064dbe8fe67ee0f2983eb004de1fbe5;hp=9b6ba088ad85bf1dfab524cec349eed437664e96;hpb=fc3e16ee6c45ac0e550735eb1955b4f578b9c0ca;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index 9b6ba088..79b1198b 100644
--- a/render.h
+++ b/render.h
@@ -54,6 +54,8 @@ extern cvar_t gl_flashblend;
 // vis stuff
 extern cvar_t r_novis;
 
+extern cvar_t r_trippy;
+
 extern cvar_t r_lerpsprites;
 extern cvar_t r_lerpmodels;
 extern cvar_t r_lerplightstyles;
@@ -101,6 +103,7 @@ void R_Mesh_AddBrushMeshFromPlanes(rmesh_t *mesh, int numplanes, mplane_t *plane
 extern cvar_t r_nearclip;
 
 // forces all rendering to draw triangle outlines
+extern cvar_t r_showoverdraw;
 extern cvar_t r_showtris;
 extern cvar_t r_shownormals;
 extern cvar_t r_showlighting;
@@ -143,7 +146,7 @@ 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_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height);
+skinframe_t *R_SkinFrame_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height, qboolean sRGB);
 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);
 skinframe_t *R_SkinFrame_LoadMissing(void);
@@ -199,12 +202,6 @@ extern cvar_t r_smoothnormals_areaweighting;
 
 extern cvar_t r_test;
 
-extern cvar_t r_texture_convertsRGB_2d;
-extern cvar_t r_texture_convertsRGB_skin;
-extern cvar_t r_texture_convertsRGB_cubemap;
-extern cvar_t r_texture_convertsRGB_skybox;
-extern cvar_t r_texture_convertsRGB_particles;
-
 #include "gl_backend.h"
 
 extern rtexture_t *r_texture_blanknormalmap;
@@ -332,8 +329,8 @@ typedef struct rsurfacestate_s
 	int ent_skinnum;
 	int ent_qwskin;
 	int ent_flags;
-	float ent_shadertime;
 	int ent_alttextures; // used by q1bsp animated textures (pressed buttons)
+	double shadertime; // r_refdef.scene.time - ent->shadertime
 	// transform matrices to render this entity and effects on this entity
 	matrix4x4_t matrix;
 	matrix4x4_t inversematrix;
@@ -401,6 +398,8 @@ rsurfacestate_t;
 
 extern rsurfacestate_t rsurface;
 
+void R_HDR_UpdateIrisAdaptation(const vec3_t point);
+
 void RSurf_ActiveWorldEntity(void);
 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);
@@ -442,59 +441,10 @@ typedef enum rsurfacepass_e
 }
 rsurfacepass_t;
 
-typedef enum gl20_texunit_e
-{
-	// postprocess shaders, and generic shaders:
-	GL20TU_FIRST = 0,
-	GL20TU_SECOND = 1,
-	GL20TU_GAMMARAMPS = 2,
-	// standard material properties
-	GL20TU_NORMAL = 0,
-	GL20TU_COLOR = 1,
-	GL20TU_GLOSS = 2,
-	GL20TU_GLOW = 3,
-	// material properties for a second material
-	GL20TU_SECONDARY_NORMAL = 4,
-	GL20TU_SECONDARY_COLOR = 5,
-	GL20TU_SECONDARY_GLOSS = 6,
-	GL20TU_SECONDARY_GLOW = 7,
-	// material properties for a colormapped material
-	// conflicts with secondary material
-	GL20TU_PANTS = 4,
-	GL20TU_SHIRT = 7,
-	// fog fade in the distance
-	GL20TU_FOGMASK = 8,
-	// compiled ambient lightmap and deluxemap
-	GL20TU_LIGHTMAP = 9,
-	GL20TU_DELUXEMAP = 10,
-	// refraction, used by water shaders
-	GL20TU_REFRACTION = 3,
-	// reflection, used by water shaders, also with normal material rendering
-	// conflicts with secondary material
-	GL20TU_REFLECTION = 7,
-	// rtlight attenuation (distance fade) and cubemap filter (projection texturing)
-	// conflicts with lightmap/deluxemap
-	GL20TU_ATTENUATION = 9,
-	GL20TU_CUBE = 10,
-	GL20TU_SHADOWMAP2D = 15,
-	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,
-	// fake reflections
-	GL20TU_REFLECTMASK = 5,
-	GL20TU_REFLECTCUBE = 6,
-	GL20TU_FOGHEIGHTTEXTURE = 14
-}
-gl20_texunit;
-
-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, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane);
+void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemode, int rgbscale, qboolean usegamma, qboolean notrippy);
+void R_SetupShader_DepthOrShadow(qboolean notrippy);
+void R_SetupShader_ShowDepth(qboolean notrippy);
+void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane, qboolean notrippy);
 void R_SetupShader_DeferredLight(const rtlight_t *rtlight);
 
 typedef struct r_waterstate_waterplane_s