remove unused tex1d parameters

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9559 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_backend.c b/gl_backend.c
index ed8a3f6d58013f2bde5e5d7bc06472fcea46815c..20182617d62fd20f53535b5ec986b68d4a46c385 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1685,7 +1685,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
        }
 }
 
-void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle)
+void R_Mesh_TexBindAll(unsigned int unitnum, int tex2d, int tex3d, int texcubemap, int texrectangle)
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
@@ -2184,7 +2184,7 @@ void R_Mesh_TextureState(const rmeshstate_t *m)
        }
 
        for (i = 0;i < backendimageunits;i++)
-               R_Mesh_TexBindAll(i, m->tex1d[i], m->tex[i], m->tex3d[i], m->texcubemap[i], m->texrectangle[i]);
+               R_Mesh_TexBindAll(i, m->tex[i], m->tex3d[i], m->texcubemap[i], m->texrectangle[i]);
        for (i = 0;i < backendarrayunits;i++)
        {
                if (m->pointer_texcoord3f[i])

diff --git a/gl_backend.h b/gl_backend.h
index b9506ef579f7ac7fed1635266aa7662d79874035..4a60799922601a266006cec702d7ff281828f7be 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -46,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];
@@ -99,7 +98,7 @@ 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);
+void R_Mesh_TexBindAll(unsigned int unitnum, 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_TexBind(unsigned int unitnum, int texnum);