From 9556d038c1dd8d49de229fa5647985216ee83a53 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Fri, 28 Dec 2001 21:52:25 +0000 Subject: [PATCH] And a few more GL_TEXTURE0/GL_TEXTURE1 fixes. --- ref_gl/gl_rsurf.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ref_gl/gl_rsurf.c b/ref_gl/gl_rsurf.c index 1741828..d7ba45c 100644 --- a/ref_gl/gl_rsurf.c +++ b/ref_gl/gl_rsurf.c @@ -773,8 +773,8 @@ dynamic: c_brush_polys++; - GL_MBind( GL_TEXTURE0, image->texnum ); - GL_MBind( GL_TEXTURE1, gl_state.lightmap_textures + lmtex ); + GL_MBind( GL_Texture0, image->texnum ); + GL_MBind( GL_Texture1, gl_state.lightmap_textures + lmtex ); //========== //PGM @@ -792,8 +792,8 @@ dynamic: qglBegin (GL_POLYGON); for (i=0 ; i< nv; i++, v+= VERTEXSIZE) { - qglMTexCoord2fSGIS( GL_TEXTURE0, (v[3]+scroll), v[4]); - qglMTexCoord2fSGIS( GL_TEXTURE1, v[5], v[6]); + qglMTexCoord2fSGIS( GL_Texture0, (v[3]+scroll), v[4]); + qglMTexCoord2fSGIS( GL_Texture1, v[5], v[6]); qglVertex3fv (v); } qglEnd (); @@ -807,8 +807,8 @@ dynamic: qglBegin (GL_POLYGON); for (i=0 ; i< nv; i++, v+= VERTEXSIZE) { - qglMTexCoord2fSGIS( GL_TEXTURE0, v[3], v[4]); - qglMTexCoord2fSGIS( GL_TEXTURE1, v[5], v[6]); + qglMTexCoord2fSGIS( GL_Texture0, v[3], v[4]); + qglMTexCoord2fSGIS( GL_Texture1, v[5], v[6]); qglVertex3fv (v); } qglEnd (); @@ -821,8 +821,8 @@ dynamic: { c_brush_polys++; - GL_MBind( GL_TEXTURE0, image->texnum ); - GL_MBind( GL_TEXTURE1, gl_state.lightmap_textures + lmtex ); + GL_MBind( GL_Texture0, image->texnum ); + GL_MBind( GL_Texture1, gl_state.lightmap_textures + lmtex ); //========== //PGM @@ -840,8 +840,8 @@ dynamic: qglBegin (GL_POLYGON); for (i=0 ; i< nv; i++, v+= VERTEXSIZE) { - qglMTexCoord2fSGIS( GL_TEXTURE0, (v[3]+scroll), v[4]); - qglMTexCoord2fSGIS( GL_TEXTURE1, v[5], v[6]); + qglMTexCoord2fSGIS( GL_Texture0, (v[3]+scroll), v[4]); + qglMTexCoord2fSGIS( GL_Texture1, v[5], v[6]); qglVertex3fv (v); } qglEnd (); @@ -857,8 +857,8 @@ dynamic: qglBegin (GL_POLYGON); for (i=0 ; i< nv; i++, v+= VERTEXSIZE) { - qglMTexCoord2fSGIS( GL_TEXTURE0, v[3], v[4]); - qglMTexCoord2fSGIS( GL_TEXTURE1, v[5], v[6]); + qglMTexCoord2fSGIS( GL_Texture0, v[3], v[4]); + qglMTexCoord2fSGIS( GL_Texture1, v[5], v[6]); qglVertex3fv (v); } qglEnd (); @@ -1008,9 +1008,9 @@ e->angles[0] = -e->angles[0]; // stupid quake bug e->angles[2] = -e->angles[2]; // stupid quake bug GL_EnableMultitexture( true ); - GL_SelectTexture( GL_TEXTURE0); + GL_SelectTexture( GL_Texture0); GL_TexEnv( GL_REPLACE ); - GL_SelectTexture( GL_TEXTURE1); + GL_SelectTexture( GL_Texture1); GL_TexEnv( GL_MODULATE ); R_DrawInlineBModel (); @@ -1222,9 +1222,9 @@ void R_DrawWorld (void) { GL_EnableMultitexture( true ); - GL_SelectTexture( GL_TEXTURE0); + GL_SelectTexture( GL_Texture0); GL_TexEnv( GL_REPLACE ); - GL_SelectTexture( GL_TEXTURE1); + GL_SelectTexture( GL_Texture1); if ( gl_lightmap->value ) GL_TexEnv( GL_REPLACE ); @@ -1572,7 +1572,7 @@ void GL_BeginBuildingLightmaps (model_t *m) r_framecount = 1; // no dlightcache GL_EnableMultitexture( true ); - GL_SelectTexture( GL_TEXTURE1); + GL_SelectTexture( GL_Texture1); /* ** setup the base lightstyles so the lightmaps won't have to be regenerated