projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
glx
/
glxclient.h
diff --git
a/src/glx/glxclient.h
b/src/glx/glxclient.h
index 8e5dc785dd981206a43e2b733fa32ed8813fafdd..57d254ea9873f54fe3ecae6e5ef0cb979d7c6735 100644
(file)
--- 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) )
#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
/**
* 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 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
/*
** Functions to obtain driver configuration information from a direct
** rendering client application
@@
-405,8
+408,13
@@
struct __GLXcontextRec
const __GLcontextModes *mode;
#ifdef GLX_DIRECT_RENDERING
const __GLcontextModes *mode;
#ifdef GLX_DIRECT_RENDERING
+#ifdef GLX_USE_APPLEGL
+ void *driContext;
+ Bool do_destroy;
+#else
__GLXDRIcontext *driContext;
__DRIcontext *__driContext;
__GLXDRIcontext *driContext;
__DRIcontext *__driContext;
+#endif
#endif
/**
#endif
/**
@@
-503,7
+511,7
@@
struct __GLXscreenConfigsRec
*/
char *effectiveGLXexts;
*/
char *effectiveGLXexts;
-#if
def GLX_DIRECT_RENDERING
+#if
defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
* Per screen direct rendering interface functions and data.
*/
/**
* Per screen direct rendering interface functions and data.
*/
@@
-549,6
+557,10
@@
struct __GLXscreenConfigsRec
const __DRI2flushExtension *f;
#endif
const __DRI2flushExtension *f;
#endif
+#ifdef __DRI2_CONFIG_QUERY
+ const __DRI2configQueryExtension *config;
+#endif
+
#endif
/**
#endif
/**
@@
-614,7
+626,7
@@
struct __GLXdisplayPrivateRec
*/
__GLXscreenConfigs *screenConfigs;
*/
__GLXscreenConfigs *screenConfigs;
-#if
def GLX_DIRECT_RENDERING
+#if
defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
* Per display direct rendering interface functions and data.
*/
/**
* Per display direct rendering interface functions and data.
*/
@@
-792,7
+804,7
@@
extern GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
int32_t * numerator,
int32_t * denominator);
int32_t * numerator,
int32_t * denominator);
-#if
def GLX_DIRECT_RENDERING
+#if
defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
GLboolean
__driGetMscRateOML(__DRIdrawable * draw,
int32_t * numerator, int32_t * denominator, void *private);
GLboolean
__driGetMscRateOML(__DRIdrawable * draw,
int32_t * numerator, int32_t * denominator, void *private);