From 286ce2719395485ffafb38097fa2551b066acd96 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Tue, 6 Nov 2007 14:34:15 -0500
Subject: Fix compilation for !GLX_DIRECT_RENDERING.

---
 src/glx/x11/glxclient.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/glx/x11/glxclient.h')

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__ */
-- 
cgit v1.2.3