summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/glxapi.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-05-29 19:48:46 +0000
committerBrian Paul <[email protected]>2001-05-29 19:48:46 +0000
commit655ba5d9927187e76b66f5886d090624dc4b1dd9 (patch)
tree7f6ea684f68a868bdbb4612f3b2c4ce1c7a8a89f /src/mesa/drivers/x11/glxapi.c
parentffa10b1c3b3c944438d0a75c84acdbd92091c35c (diff)
removed some old DRI-isms
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.c')
-rw-r--r--src/mesa/drivers/x11/glxapi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 007579250a8..781da5cb13b 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.25 2001/05/29 16:23:26 brianp Exp $ */
+/* $Id: glxapi.c,v 1.26 2001/05/29 19:48:46 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -98,7 +98,7 @@ get_dispatch(Display *dpy)
#ifdef GLX_BUILD_IN_XLIB_MESA
if (getenv("LIBGL_DEBUG")) {
fprintf(stderr,
- "libGL: server lacks GLX extension. Using Mesa Xlib renderer.");
+ "libGL: server lacks GLX extension. Using Mesa Xlib renderer.\n");
}
#endif
t = _mesa_GetGLXDispatchTable();
@@ -672,10 +672,15 @@ GLXContextID glXGetContextIDEXT(const GLXContext context)
}
#endif
+#ifdef GLX_BUILD_IN_XLIB_MESA
+/* Use real libGL's glXGetCurrentDisplayEXT() function */
+#else
+/* stand-alone Mesa */
Display *glXGetCurrentDisplayEXT(void)
{
return glXGetCurrentDisplay();
}
+#endif
GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID)
{