summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c14
-rw-r--r--src/mesa/drivers/x11/glxapi.c15
-rw-r--r--src/mesa/drivers/x11/realglx.c12
-rw-r--r--src/mesa/drivers/x11/realglx.h6
4 files changed, 43 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 19224ffa61..aca758f6ce 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.14 1999/11/18 15:17:01 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.15 1999/11/22 21:52:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1485,6 +1485,18 @@ const char *Fake_glXGetClientString( Display *dpy, int name )
+/* GLX 1.2 and later */
+Display *Fake_glXGetCurrentDisplay( void )
+{
+ XMesaContext xmesa = XMesaGetCurrentContext();
+ if (xmesa && xmesa->xm_visual)
+ return xmesa->xm_visual->display;
+ else
+ return NULL;
+}
+
+
+
/*
* Release the depth, stencil, accum buffers attached to a GLXDrawable
* (a window or pixmap) prior to destroying the GLXDrawable.
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index f845b5a5bc..d48f3151d4 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.4 1999/10/27 09:50:10 brianp Exp $ */
+/* $Id: glxapi.c,v 1.5 1999/11/22 21:52:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -348,6 +348,19 @@ const char *glXGetClientString( Display *dpy, int name )
+/* GLX 1.2 and later */
+Display *glXGetCurrentDisplay( void )
+{
+#ifdef REALGLX
+ if (display_has_glx(dpy))
+ return Real_glXGetCurrentDisplay();
+ else
+#endif
+ return Fake_glXGetCurrentDisplay();
+}
+
+
+
#ifdef GLX_MESA_release_buffers
Bool glXReleaseBuffersMESA( Display *dpy, Window w )
{
diff --git a/src/mesa/drivers/x11/realglx.c b/src/mesa/drivers/x11/realglx.c
index 79a280419a..29d739881d 100644
--- a/src/mesa/drivers/x11/realglx.c
+++ b/src/mesa/drivers/x11/realglx.c
@@ -1,4 +1,4 @@
-/* $Id: realglx.c,v 1.1 1999/08/19 00:55:42 jtg Exp $ */
+/* $Id: realglx.c,v 1.2 1999/11/22 21:52:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -237,3 +237,13 @@ const char *Real_glXGetClientString( Display *dpy, int name )
(void) name;
return 0;
}
+
+
+
+/* GLX 1.2 and later */
+Display *Real_glXGetCurrentDisplay( void )
+{
+ return 0;
+}
+
+
diff --git a/src/mesa/drivers/x11/realglx.h b/src/mesa/drivers/x11/realglx.h
index 9587db60c9..4f19f05b3d 100644
--- a/src/mesa/drivers/x11/realglx.h
+++ b/src/mesa/drivers/x11/realglx.h
@@ -1,4 +1,4 @@
-/* $Id: realglx.h,v 1.1 1999/08/19 00:55:42 jtg Exp $ */
+/* $Id: realglx.h,v 1.2 1999/11/22 21:52:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -108,4 +108,8 @@ extern const char *Real_glXQueryServerString( Display *dpy, int screen,
extern const char *Real_glXGetClientString( Display *dpy, int name );
+/* GLX 1.2 and later */
+extern Display *Real_glXGetCurrentDisplay( void );
+
+
#endif