summaryrefslogtreecommitdiffstats
path: root/src/glx/glxclient.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/glx/glxclient.h')
-rw-r--r--src/glx/glxclient.h20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 958e152..8e5dc78 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -97,14 +97,9 @@ typedef struct _glapi_table __GLapi;
#define containerOf(ptr, type, member) \
(type *)( (char *)ptr - offsetof(type,member) )
-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
* \c driCreateDisplay call.
@@ -190,6 +185,8 @@ 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
@@ -408,14 +405,9 @@ 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
@@ -511,7 +503,7 @@ struct __GLXscreenConfigsRec
*/
char *effectiveGLXexts;
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+#ifdef GLX_DIRECT_RENDERING
/**
* Per screen direct rendering interface functions and data.
*/
@@ -622,7 +614,7 @@ struct __GLXdisplayPrivateRec
*/
__GLXscreenConfigs *screenConfigs;
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+#ifdef GLX_DIRECT_RENDERING
/**
* Per display direct rendering interface functions and data.
*/
@@ -800,7 +792,7 @@ extern GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
int32_t * numerator,
int32_t * denominator);
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+#ifdef GLX_DIRECT_RENDERING
GLboolean
__driGetMscRateOML(__DRIdrawable * draw,
int32_t * numerator, int32_t * denominator, void *private);