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@bitplanet.net>

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 81c9a26669635a6f950a2f67d865babb7810cc1c..813547ae51aa7e4a325697b274f92da66ab30dc3 100644 (file)
--- 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