From: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue, 7 Sep 2010 16:40:37 +0000 (-0400)
Subject: glx: Move dpy and scr fields out of direct rendering conditional
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60fce15447da7d4135ace6f1433896b0a02bcfee;p=mesa.git

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 81c9a266696..813547ae51a 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