From dfd7045e4662eef3e9d6fba7085527e36e8917d8 Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 5 Sep 2007 18:56:39 +0000
Subject: * Replace the ugliness in qgl.h with SDL_opengl.h

git-svn-id: svn://svn.icculus.org/quake3/trunk@1163 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/sdl/sdl_glimp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'code/sdl')

diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index b32dac1..cb9a70e 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -62,12 +62,12 @@ static SDL_Surface *screen = NULL;
 
 cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained
 
-void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
-void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
+PFNGLMULTITEXCOORD2FARBPROC qglMultiTexCoord2fARB;
+PFNGLACTIVETEXTUREARBPROC qglActiveTextureARB;
+PFNGLCLIENTACTIVETEXTUREARBPROC qglClientActiveTextureARB;
 
-void ( APIENTRY * qglLockArraysEXT)( GLint, GLint);
-void ( APIENTRY * qglUnlockArraysEXT) ( void );
+PFNGLLOCKARRAYSEXTPROC qglLockArraysEXT;
+PFNGLUNLOCKARRAYSEXTPROC qglUnlockArraysEXT;
 
 /*
 ===============
@@ -387,7 +387,7 @@ static void GLimp_InitExtensions( void )
 			if ( qglActiveTextureARB )
 			{
 				GLint glint = 0;
-				qglGetIntegerv( GL_MAX_ACTIVE_TEXTURES_ARB, &glint );
+				qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint );
 				glConfig.maxActiveTextures = (int) glint;
 				if ( glConfig.maxActiveTextures > 1 )
 				{
-- 
cgit v1.2.3