some cleanup of shader permutation handling

[xonotic/darkplaces.git] / gl_backend.h

diff --git a/gl_backend.h b/gl_backend.h
index dcb7ed972aa2d49209c4caf32a8c32af8014e9be..014884ed57b7deeeb3a83537ac89efa4a70351ab 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -2,7 +2,8 @@
 #ifndef GL_BACKEND_H
 #define GL_BACKEND_H
 
-#define MAX_TEXTUREUNITS 16
+// how many texture units to track state on (backendunits/backendimageunits/backendarrayunits are limited to this value)
+#define MAX_TEXTUREUNITS 64
 
 #define POLYGONELEMENTS_MAXPOINTS 258
 extern int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
@@ -10,16 +11,17 @@ extern int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
 extern int quadelements[QUADELEMENTS_MAXQUADS*6];
 
 void GL_SetupView_Orientation_Identity(void);
-void GL_SetupView_Orientation_FromEntity(matrix4x4_t *matrix);
+void GL_SetupView_Orientation_FromEntity(const matrix4x4_t *matrix);
 void GL_SetupView_Mode_Perspective(double frustumx, double frustumy, double zNear, double zFar);
 void GL_SetupView_Mode_PerspectiveInfiniteFarClip(double frustumx, double frustumy, double zNear);
 void GL_SetupView_Mode_Ortho(double x1, double y1, double x2, double y2, double zNear, double zFar);
 void GL_BlendFunc(int blendfunc1, int blendfunc2);
 void GL_DepthMask(int state);
 void GL_DepthTest(int state);
+void GL_CullFace(int state);
+void GL_AlphaTest(int state);
 void GL_ColorMask(int r, int g, int b, int a);
 void GL_Color(float cr, float cg, float cb, float ca);
-void GL_ShowTrisColor(float cr, float cg, float cb, float ca);
 void GL_TransformToScreen(const vec4_t in, vec4_t out);
 void GL_LockArrays(int first, int count);
 void GL_ActiveTexture(unsigned int num);
@@ -28,7 +30,7 @@ void GL_Scissor(int x, int y, int width, int height);
 void GL_ScissorTest(int state);
 void GL_Clear(int mask);
 
-unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **vertexstrings_list, int fragmentstrings_count, const char **fragmentstrings_list);
+unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **vertexstrings_list, int geometrystrings_count, const char **geometrystrings_list, int fragmentstrings_count, const char **fragmentstrings_list);
 void GL_Backend_FreeProgram(unsigned int prog);
 
 extern cvar_t gl_lockarrays;
@@ -36,7 +38,7 @@ extern cvar_t gl_mesh_copyarrays;
 extern cvar_t gl_paranoid;
 extern cvar_t gl_printcheckerror;
 
-//input to R_Mesh_State
+//input to R_Mesh_TextureState
 typedef struct rmeshstate_s
 {
        // textures
@@ -54,10 +56,6 @@ typedef struct rmeshstate_s
        // pointers
        const float *pointer_texcoord[MAX_TEXTUREUNITS]; // 2D
        const float *pointer_texcoord3f[MAX_TEXTUREUNITS]; // 3D
-
-       // other state set by this
-       const float *pointer_vertex;
-       const float *pointer_color;
 }
 rmeshstate_t;
 
@@ -91,8 +89,10 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum);
 void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix);
 // sets the combine state for a texenv unit
 void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, int rgbscale, int alphascale);
-// set up the requested entire rendering state
-void R_Mesh_State(const rmeshstate_t *m);
+// set up the requested texture state
+void R_Mesh_TextureState(const rmeshstate_t *m);
+// set up a blank texture state (faster/easier specialized version of R_Mesh_TextureState)
+void R_Mesh_ResetTextureState(void);
 
 // renders a mesh
 void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements);
@@ -106,15 +106,7 @@ void R_ClearScreen(void);
 // invoke refresh of frame
 void SCR_UpdateScreen(void);
 // invoke refresh of loading plaque (nothing else seen)
-void SCR_UpdateLoadingScreen(void);
-
-extern float varray_vertex3f[65536*3];
-extern float varray_svector3f[65536*3];
-extern float varray_tvector3f[65536*3];
-extern float varray_normal3f[65536*3];
-extern float varray_color4f[65536*4];
-extern float varray_texcoord3f[65536*3];
-extern float varray_vertex3f2[65536*3];
+void SCR_UpdateLoadingScreen(qboolean clear);
 
 #endif