From d160ba93d1f77c0b07b0b573d9f17d8537d5d9ac Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 22 Sep 2022 17:46:49 +0800 Subject: [PATCH] glx: Adopt guard of glx_direct and glx_accel in #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) Signed-off-by: Yonggang Luo Reviewed-by: Adam Jackson Part-of: --- src/glx/glxext.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 884611b..62c256b 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -872,9 +872,6 @@ __glXInitialize(Display * dpy) { XExtCodes *codes; struct glx_display *dpyPriv, *d; -#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - Bool glx_direct, glx_accel; -#endif int i, majorVersion = 0; _XLockMutex(_Xglobal_lock); @@ -924,8 +921,8 @@ __glXInitialize(Display * dpy) dpyPriv->glXDrawHash = __glxHashCreate(); #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - glx_direct = !env_var_as_boolean("LIBGL_ALWAYS_INDIRECT", false); - glx_accel = !env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); + Bool glx_direct = !env_var_as_boolean("LIBGL_ALWAYS_INDIRECT", false); + Bool glx_accel = !env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); Bool explicit_zink = env && !strcmp(env, "zink"); Bool infer_zink = false; -- 2.7.4