qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 13:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Repair lack of foresight in using 'int GL_TEXTURE0, GLTEXTURE1;'

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-12-28 21:35:06 +00:00
parent 10fc361f7a
commit f134ecf962
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ref_gl/gl_rmain.c
View file

@ -26,7 +26,7 @@ viddef_t vid;
refimport_t ri; refimport_t ri;
int GL_TEXTURE0, GL_TEXTURE1; int GL_Texture0, GL_Texture1;
model_t *r_worldmodel; model_t *r_worldmodel;
@ -1338,8 +1338,8 @@ int R_Init( void *hinstance, void *hWnd )
qglMTexCoord2fSGIS = ( void * ) qwglGetProcAddress( "glMultiTexCoord2fARB" ); qglMTexCoord2fSGIS = ( void * ) qwglGetProcAddress( "glMultiTexCoord2fARB" );
qglActiveTextureARB = ( void * ) qwglGetProcAddress( "glActiveTextureARB" ); qglActiveTextureARB = ( void * ) qwglGetProcAddress( "glActiveTextureARB" );
qglClientActiveTextureARB = ( void * ) qwglGetProcAddress( "glClientActiveTextureARB" ); qglClientActiveTextureARB = ( void * ) qwglGetProcAddress( "glClientActiveTextureARB" );
GL_TEXTURE0 = GL_TEXTURE0_ARB; GL_Texture0 = GL_TEXTURE0_ARB;
GL_TEXTURE1 = GL_TEXTURE1_ARB; GL_Texture1 = GL_TEXTURE1_ARB;
} }
else else
{ {
@ -1362,8 +1362,8 @@ int R_Init( void *hinstance, void *hWnd )
ri.Con_Printf( PRINT_ALL, "...using GL_SGIS_multitexture\n" ); ri.Con_Printf( PRINT_ALL, "...using GL_SGIS_multitexture\n" );
qglMTexCoord2fSGIS = ( void * ) qwglGetProcAddress( "glMTexCoord2fSGIS" ); qglMTexCoord2fSGIS = ( void * ) qwglGetProcAddress( "glMTexCoord2fSGIS" );
qglSelectTextureSGIS = ( void * ) qwglGetProcAddress( "glSelectTextureSGIS" ); qglSelectTextureSGIS = ( void * ) qwglGetProcAddress( "glSelectTextureSGIS" );
GL_TEXTURE0 = GL_TEXTURE0_SGIS; GL_Texture0 = GL_TEXTURE0_SGIS;
GL_TEXTURE1 = GL_TEXTURE1_SGIS; GL_Texture1 = GL_TEXTURE1_SGIS;
} }
else else
{ {

2
ref_gl/qgl.h
View file

@ -481,6 +481,6 @@ void Fake_glColorTableEXT( GLenum target, GLenum internalformat,
#define GL_TEXTURE0_ARB 0x84C0 #define GL_TEXTURE0_ARB 0x84C0
#define GL_TEXTURE1_ARB 0x84C1 #define GL_TEXTURE1_ARB 0x84C1
extern int GL_TEXTURE0, GL_TEXTURE1; extern int GL_Texture0, GL_Texture1;
#endif #endif