summaryrefslogtreecommitdiffstats
path: root/src/glx/glxclient.h
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
committerBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
commit1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch)
tree5e3e1978e6cc511e90298622b7a04840a285782d /src/glx/glxclient.h
parent37e98e5cd217075d58456753ed8450dc116fe32c (diff)
parenteecd2a59c1205246cc220ab09a79988838bb1759 (diff)
downloadexternal_mesa3d-1fa7789e828d1005e2473fc7cd364bd45eb30843.zip
external_mesa3d-1fa7789e828d1005e2473fc7cd364bd45eb30843.tar.gz
external_mesa3d-1fa7789e828d1005e2473fc7cd364bd45eb30843.tar.bz2
Merge branch '7.8'
Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
Diffstat (limited to 'src/glx/glxclient.h')
-rw-r--r--src/glx/glxclient.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index e4b2c63..57d254e 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -97,8 +97,13 @@ typedef struct _glapi_table __GLapi;
#define containerOf(ptr, type, member) \
(type *)( (char *)ptr - offsetof(type,member) )
-#include <GL/internal/dri_interface.h>
+extern void DRI_glXUseXFont(Font font, int first, int count, int listbase);
+
+#endif
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
+#include <GL/internal/dri_interface.h>
/**
* Display dependent methods. This structure is initialized during the
@@ -185,8 +190,6 @@ extern __GLXDRIdisplay *dri2CreateDisplay(Display * dpy);
extern void dri2InvalidateBuffers(Display *dpy, XID drawable);
-extern void DRI_glXUseXFont(Font font, int first, int count, int listbase);
-
/*
** Functions to obtain driver configuration information from a direct
** rendering client application
@@ -405,9 +408,14 @@ struct __GLXcontextRec
const __GLcontextModes *mode;
#ifdef GLX_DIRECT_RENDERING
+#ifdef GLX_USE_APPLEGL
+ void *driContext;
+ Bool do_destroy;
+#else
__GLXDRIcontext *driContext;
__DRIcontext *__driContext;
#endif
+#endif
/**
* The current read-drawable for this context. Will be None if this
@@ -503,7 +511,7 @@ struct __GLXscreenConfigsRec
*/
char *effectiveGLXexts;
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
* Per screen direct rendering interface functions and data.
*/
@@ -618,7 +626,7 @@ struct __GLXdisplayPrivateRec
*/
__GLXscreenConfigs *screenConfigs;
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
* Per display direct rendering interface functions and data.
*/
@@ -796,7 +804,7 @@ extern GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
int32_t * numerator,
int32_t * denominator);
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
GLboolean
__driGetMscRateOML(__DRIdrawable * draw,
int32_t * numerator, int32_t * denominator, void *private);