[qfusion-cvs-commits] SF.net SVN: l33t: [794] trunk/qfusion/source/linux/qgl_linux.c

[qfusion s. c. <l33...@li...>]

Revision: 794
          http://l33t.svn.sourceforge.net/l33t/?rev=794&view=rev
Author:   digiman
Date:     2007-12-05 14:01:30 -0800 (Wed, 05 Dec 2007)

Log Message:
-----------
Use the UNIX-way (qglGetProcAddressARB) to fetch pointers to gl* functions

Modified Paths:
--------------
    trunk/qfusion/source/linux/qgl_linux.c

Modified: trunk/qfusion/source/linux/qgl_linux.c
===================================================================
--- trunk/qfusion/source/linux/qgl_linux.c	2007-12-05 21:22:30 UTC (rev 793)
+++ trunk/qfusion/source/linux/qgl_linux.c	2007-12-05 22:01:30 UTC (rev 794)
@@ -132,7 +132,7 @@
 		Com_Printf( "Using %s for OpenGL...", dllname );
 	}
 
-#define QGL_FUNC(type,name,params) (q##name) = ( void * )dlsym( glw_state.OpenGLLib, #name ); \
+#define QGL_FUNC(type,name,params) (q##name) = ( void * )qglGetProcAddress( #name ); \
 	if( !(q##name) ) { Com_Printf( "QGL_Init: Failed to get address for %s\n", #name ); return qfalse; }
 #define QGL_EXT(type,name,params) (q##name) = NULL;
 #define QGL_WGL(type,name,params)
@@ -160,9 +160,8 @@
 */
 void *qglGetProcAddress( const GLubyte *procName )
 {
-#if 0
-	// check for broken driver
-	if( glConfig.versionString && strcmp( glConfig.versionString, "1.3.1 NVIDIA 28.80" ) && qglXGetProcAddressARB )
+#if 1
+	if( qglXGetProcAddressARB )
 		return qglXGetProcAddressARB( procName );
 #endif
 	if( glw_state.OpenGLLib )
@@ -177,9 +176,8 @@
 {
 	int major = 0, minor = 0;
 
-	if( !qglXQueryVersion || !qglXQueryVersion( x11display.dpy, &major, &minor ) || !(minor > 0 || major > 1) ) {
+	if( !qglXQueryVersion || !qglXQueryVersion( x11display.dpy, &major, &minor ) || !(minor > 0 || major > 1) )
 		qglXQueryExtensionsString = NULL;
-	}
 	qglGetGLWExtensionsString = _qglGetGLWExtensionsString;	
 
 	return qglGetGLWExtensionsString ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.