X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=render.h;h=273e214775ba02d4d93a68ca0245a72635596576;hb=4d00367a631bdcb5b5fd7166cdd277a8d53a9a72;hp=e7b99a665ff59bed1deb7394c2f8659bf9ec313d;hpb=8aff8447d3f2c263e62ffe63f04f4c8b08f54541;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index e7b99a66..273e2147 100644
--- a/render.h
+++ b/render.h
@@ -215,8 +215,8 @@ void R_UpdateVariables(void); // must call after setting up most of r_refdef, bu
 void R_RenderView(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture, int x, int y, int width, int height); // must set r_refdef and call R_UpdateVariables and CL_UpdateEntityShading first
 void R_RenderView_UpdateViewVectors(void); // just updates r_refdef.view.{forward,left,up,origin,right,inverse_matrix}
 
-float RSurf_FogVertex(const vec3_t p);
-float RSurf_FogPoint(const vec3_t p);
+float RSurf_FogPoint(const float *v);
+float RSurf_FogVertex(const float *v);
 
 typedef enum r_refdef_scene_type_s {
 	RST_CLIENT,
@@ -554,8 +554,6 @@ extern cvar_t r_render;
 extern cvar_t r_renderview;
 extern cvar_t r_waterwarp;
 
-extern cvar_t r_textureunits;
-
 extern cvar_t r_glsl_offsetmapping;
 extern cvar_t r_glsl_offsetmapping_reliefmapping;
 extern cvar_t r_glsl_offsetmapping_scale;
@@ -593,7 +591,7 @@ void R_TimeReport(const char *name);
 void R_Stain(const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2);
 
 void R_CalcBeam_Vertex3f(float *vert, const float *org1, const float *org2, float width);
-void R_CalcSprite_Vertex3f(float *vertex3f, const float *origin, const float *left, const float *up, float scalex1, float scalex2, float scaley1, float scaley2);
+void R_CalcSprite_Vertex3f(float *vertex3f, const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2);
 
 extern mempool_t *r_main_mempool;
 
@@ -780,7 +778,7 @@ void R_HDR_UpdateIrisAdaptation(const vec3_t point);
 
 void RSurf_ActiveModelEntity(const entity_render_t *ent, qbool wantnormals, qbool wanttangents, qbool 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, qbool wantnormals, qbool wanttangents);
-void RSurf_SetupDepthAndCulling(void);
+void RSurf_SetupDepthAndCulling(bool ui);
 
 extern int r_textureframe; ///< used only by R_GetCurrentTexture, incremented per view and per UI render
 texture_t *R_GetCurrentTexture(texture_t *t);