* Remove use of GL_ARB_multitexture since this has been part of the

core API for many years now
This commit is contained in:
Tim Angus 2007-09-10 22:28:58 +00:00
parent d6f32df425
commit 4f4f0c0dab
9 changed files with 42 additions and 84 deletions

View file

@ -765,13 +765,13 @@ image_t *R_CreateImage( const char *name, const byte *pic, int width, int height
image->wrapClampMode = glWrapClampMode;
// lightmaps are always allocated on TMU 1
if ( qglActiveTextureARB && isLightmap ) {
if ( glConfig.numTextureUnits > 1 && isLightmap ) {
image->TMU = 1;
} else {
image->TMU = 0;
}
if ( qglActiveTextureARB ) {
if ( glConfig.numTextureUnits > 1 ) {
GL_SelectTexture( image->TMU );
}
@ -4849,7 +4849,7 @@ void R_DeleteTextures( void ) {
tr.numImages = 0;
Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
if ( qglActiveTextureARB ) {
if ( glConfig.numTextureUnits > 1 ) {
GL_SelectTexture( 1 );
qglBindTexture( GL_TEXTURE_2D, 0 );
GL_SelectTexture( 0 );