Mesa (master): glx: Move dpy and scr fields out of direct rendering conditional

[Kristian Høgsberg]

Module: Mesa
Branch: master
Commit: 60fce15447da7d4135ace6f1433896b0a02bcfee
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=60fce15447da7d4135ace6f1433896b0a02bcfee

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Tue Sep  7 12:40:37 2010 -0400

glx: Move dpy and scr fields out of direct rendering conditional

Nothing direct rendering specific about these fields.  Moving them out
makes no-direct-rendering compilation work again.

Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>

---

 src/glx/glxclient.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 81c9a26..813547a 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -494,13 +494,13 @@ struct glx_screen
 
    struct glx_display *display;
 
+   Display *dpy;
+   int scr;
+
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
     /**
      * Per screen direct rendering interface functions and data.
      */
-   Display *dpy;
-   int scr;
-
    __GLXDRIscreen *driScreen;
 #endif