I was just getting Xglx GLX support working again, Xglx builds it GLcore
using the USE_MGL_NAMESPACE, however my r300 driver was calling the GLcore
version of a the glapi functions and variables..
The patch below is required, the glapi.h changes are probably okay, the
glapi.c changes I'm not 100% sure about but it seems as if even with
mangling the code still passes in unmangled names..
Dave.
Index: mesa/glapi/glapi.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glapi.c,v
retrieving revision 1.96
diff -u -r1.96 glapi.c
--- mesa/glapi/glapi.c 11 Oct 2005 16:56:39 -0000 1.96
+++ mesa/glapi/glapi.c 11 Dec 2005 10:54:03 -0000
@@ -764,8 +764,8 @@
*/
#ifdef MANGLE
- if (!function_names[i] || function_names[i][0] != 'm' ||
function_names[i][1] != 'g' || function_names[i][2] != 'l')
- return GL_FALSE;
+// if (!function_names[i] || function_names[i][0] != 'm' ||
function_names[i][1] != 'g' || function_names[i][2] != 'l')
+// return GL_FALSE;
#else
if (!function_names[i] || function_names[i][0] != 'g' ||
function_names[i][1] != 'l')
return GL_FALSE;
Index: mesa/glapi/glapi.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glapi.h,v
retrieving revision 1.29
diff -u -r1.29 glapi.h
--- mesa/glapi/glapi.h 10 Aug 2005 23:54:15 -0000 1.29
+++ mesa/glapi/glapi.h 11 Dec 2005 10:54:03 -0000
@@ -50,6 +50,14 @@
typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
+#if defined(USE_MGL_NAMESPACE)
+#define _glapi_set_dispatch _mglapi_set_dispatch
+#define _glapi_get_dispatch _mglapi_get_dispatch
+#define _glapi_set_context _mglapi_set_context
+#define _glapi_get_context _mglapi_get_context
+#define _glapi_Context _mglapi_Context
+#define _glapi_Dispatch _mglapi_Dispatch
+#endif
#if defined (GLX_USE_TLS)
@@ -104,7 +112,6 @@
extern void *
_glapi_get_context(void);
-
extern void
_glapi_set_dispatch(struct _glapi_table *dispatch);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
