fix GL11/GL13 fogged sprite rendering and q1bsp sky rendering - the

[xonotic/darkplaces.git] / gl_backend.h

diff --git a/gl_backend.h b/gl_backend.h
index e8113e21130cb08e6687c8a499e357d0792bc165..e11be01487f9585686b8f3c40f4916b4f2e53ad3 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -2,9 +2,6 @@
 #ifndef GL_BACKEND_H
 #define GL_BACKEND_H
 
-// 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 polygonelement3i[(POLYGONELEMENTS_MAXPOINTS-2)*3];
 extern unsigned short polygonelement3s[(POLYGONELEMENTS_MAXPOINTS-2)*3];
@@ -49,7 +46,6 @@ extern cvar_t gl_printcheckerror;
 typedef struct rmeshstate_s
 {
        // textures
-       int tex1d[MAX_TEXTUREUNITS];
        int tex[MAX_TEXTUREUNITS];
        int tex3d[MAX_TEXTUREUNITS];
        int texcubemap[MAX_TEXTUREUNITS];
@@ -102,14 +98,9 @@ void R_Mesh_ColorPointer(const float *color4f, int bufferobject, size_t bufferof
 // sets the texcoord array pointer for an array unit
 void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord, int bufferobject, size_t bufferoffset);
 // sets all textures bound to an image unit (multiple can be non-zero at once, according to OpenGL rules the highest one overrides the others)
-void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle);
-// sets these are like TexBindAll with only one of the texture indices non-zero
-// (binds one texture type and unbinds all other types)
-void R_Mesh_TexBind1D(unsigned int unitnum, int texnum);
+void R_Mesh_TexBindAll(unsigned int unitnum, int tex2d, int tex3d, int texcubemap, int texrectangle);
+// equivalent to R_Mesh_TexBindAll(unitnum,tex2d,0,0,0)
 void R_Mesh_TexBind(unsigned int unitnum, int texnum);
-void R_Mesh_TexBind3D(unsigned int unitnum, int texnum);
-void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum);
-void R_Mesh_TexBindRectangle(unsigned int unitnum, int texnum);
 // sets the texcoord matrix for a texenv unit
 void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix);
 // sets the combine state for a texenv unit