summaryrefslogtreecommitdiff
path: root/src/glx/x11/glxclient.h
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-11-06 14:34:15 -0500
committerKristian Høgsberg <krh@redhat.com>2007-11-06 14:34:15 -0500
commit286ce2719395485ffafb38097fa2551b066acd96 (patch)
tree25b67492c9fa0d1a896c12453af97c852bf2b4b8 /src/glx/x11/glxclient.h
parent001de0ac4e9ccd5c440dca4a2994deca668a2d9f (diff)
Fix compilation for !GLX_DIRECT_RENDERING.
Diffstat (limited to 'src/glx/x11/glxclient.h')
-rw-r--r--src/glx/x11/glxclient.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h
index b5951bd62a..05354073c4 100644
--- a/src/glx/x11/glxclient.h
+++ b/src/glx/x11/glxclient.h
@@ -342,16 +342,16 @@ struct __GLXcontextRec {
*/
GLint majorOpcode;
-#ifdef GLX_DIRECT_RENDERING
/**
- * Per context direct rendering interface functions and data.
+ * Pointer to the mode used to create this context.
*/
- __DRIcontext driContext;
+ const __GLcontextModes * mode;
+#ifdef GLX_DIRECT_RENDERING
/**
- * Pointer to the mode used to create this context.
+ * Per context direct rendering interface functions and data.
*/
- const __GLcontextModes * mode;
+ __DRIcontext driContext;
/**
* XID for the server side drm_context_t
@@ -719,7 +719,12 @@ extern int __glXGetInternalVersion(void);
/* Get the unadjusted system time */
extern int __glXGetUST( int64_t * ust );
-extern GLboolean __glXGetMscRateOML(__DRIdrawable *draw,
+extern GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
int32_t * numerator, int32_t * denominator);
+#ifdef GLX_DIRECT_RENDERING
+GLboolean
+__driGetMscRateOML(__DRIdrawable *draw, int32_t *numerator, int32_t *denominator);
+#endif
+
#endif /* !__GLX_client_h__ */