From d7e2ea803b618f20b35a4c133d5da7e9ae790a43 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Thu, 22 Sep 2022 17:49:34 +0800
Subject: [PATCH] glx: Adot #ifdef GLX_USE_WINDOWSGL in #if
 defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)

glx_direct and glx_accel are guard by #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18749>
---
 src/glx/glxext.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 62c256b..6e5dbc2 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -954,6 +954,11 @@ __glXInitialize(Display * dpy)
 #endif /* GLX_USE_DRM */
    if (glx_direct)
       dpyPriv->driswDisplay = driswCreateDisplay(dpy, explicit_zink | infer_zink);
+
+#ifdef GLX_USE_WINDOWSGL
+   if (glx_direct && glx_accel)
+      dpyPriv->windowsdriDisplay = driwindowsCreateDisplay(dpy);
+#endif
 #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */
 
 #ifdef GLX_USE_APPLEGL
@@ -963,11 +968,6 @@ __glXInitialize(Display * dpy)
    }
 #endif
 
-#ifdef GLX_USE_WINDOWSGL
-   if (glx_direct && glx_accel)
-      dpyPriv->windowsdriDisplay = driwindowsCreateDisplay(dpy);
-#endif
-
    if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
       Bool fail = true;
-- 
2.7.4