From decafeddd331417bdaca44c6c0fb1dbd4caabe81 Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Fri, 20 May 2005 12:48:06 +0000 Subject: [PATCH] Fixed clearing of qglClientActiveTextureARB if multitexturing couldn't be enabled. 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 --- engine/gl/gl_vidcommon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/gl/gl_vidcommon.c b/engine/gl/gl_vidcommon.c index 5f3d80145..fab242fe3 100644 --- a/engine/gl/gl_vidcommon.c +++ b/engine/gl/gl_vidcommon.c @@ -223,7 +223,6 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name)) if (strstr(gl_extensions, "GL_ARB_multitexture") && !COM_CheckParm("-noamtex")) { //ARB multitexture is the popular choice. - Con_SafePrintf("ARB Multitexture extensions found. Use -noamtex to disable.\n"); qglActiveTextureARB = (void *) getglext("glActiveTextureARB"); qglClientActiveTextureARB = (void *) getglext("glClientActiveTextureARB"); qglMultiTexCoord2fARB = (void *) getglext("glMultiTexCoord2fARB"); @@ -241,6 +240,7 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name)) if (!qglActiveTextureARB || !qglClientActiveTextureARB || !qglMultiTexCoord2fARB || !qglMultiTexCoord3fARB) { qglActiveTextureARB = NULL; + qglClientActiveTextureARB = NULL; qglMultiTexCoord2fARB = NULL; qglMultiTexCoord3fARB = NULL; qglMTexCoord2fSGIS = NULL; @@ -248,6 +248,10 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name)) gl_mtexable=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"))