nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-29 23:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed clearing of qglClientActiveTextureARB if multitexturing couldn't be enabled.

Browse source 
Moved printf to tell the user that multitexturing is enabled to make it really only say
that if it was. Before it would say so even if the addresses of the MT functions
couldn't be found.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1042 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2005-05-20 12:48:06 +00:00
parent 31d5705e75
commit decafeddd3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/gl/gl_vidcommon.c
View file

@ -223,7 +223,6 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name))
if (strstr(gl_extensions, "GL_ARB_multitexture") && !COM_CheckParm("-noamtex")) if (strstr(gl_extensions, "GL_ARB_multitexture") && !COM_CheckParm("-noamtex"))
{ //ARB multitexture is the popular choice. { //ARB multitexture is the popular choice.
Con_SafePrintf("ARB Multitexture extensions found. Use -noamtex to disable.\n");
qglActiveTextureARB = (void *) getglext("glActiveTextureARB"); qglActiveTextureARB = (void *) getglext("glActiveTextureARB");
qglClientActiveTextureARB = (void *) getglext("glClientActiveTextureARB"); qglClientActiveTextureARB = (void *) getglext("glClientActiveTextureARB");
qglMultiTexCoord2fARB = (void *) getglext("glMultiTexCoord2fARB"); qglMultiTexCoord2fARB = (void *) getglext("glMultiTexCoord2fARB");
@ -241,6 +240,7 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name))
if (!qglActiveTextureARB || !qglClientActiveTextureARB || !qglMultiTexCoord2fARB || !qglMultiTexCoord3fARB) if (!qglActiveTextureARB || !qglClientActiveTextureARB || !qglMultiTexCoord2fARB || !qglMultiTexCoord3fARB)
{ {
qglActiveTextureARB = NULL; qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
qglMultiTexCoord2fARB = NULL; qglMultiTexCoord2fARB = NULL;
qglMultiTexCoord3fARB = NULL; qglMultiTexCoord3fARB = NULL;
qglMTexCoord2fSGIS = NULL; qglMTexCoord2fSGIS = NULL;
@ -248,6 +248,10 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name))
gl_mtexable=false; gl_mtexable=false;
gl_mtexarbable = false; gl_mtexarbable = false;
} }
else
{
Con_SafePrintf("ARB Multitexture extensions found. Use -noamtex to disable.\n");
}
} }
else if (strstr(gl_extensions, "GL_SGIS_multitexture") && !COM_CheckParm("-nomtex")) else if (strstr(gl_extensions, "GL_SGIS_multitexture") && !COM_CheckParm("-nomtex"))