[gtk/debug-envvars-cleanup: 4/16] Make vulkan-disable always available

[Matthias Clasen <matthiasc src gnome org>]

commit a337b21a4fdd934e66cb1cc976a62ac578b6e695
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 21 20:51:35 2022 -0400

    Make vulkan-disable always available
    
    There is no need to restrict this to debug builds.

 gdk/gdk.c        | 2 +-
 gdk/gdksurface.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 8b7c52769c..73b5371c36 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -127,7 +127,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
   { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
   { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
-  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
+  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support", TRUE },
   { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer", TRUE },
   { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
   { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible", TRUE },
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 067267fb1a..239dbb33aa 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1220,7 +1220,7 @@ gdk_surface_create_vulkan_context (GdkSurface  *surface,
   g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-  if (GDK_DISPLAY_DEBUG_CHECK (surface->display, VULKAN_DISABLE))
+  if (gdk_display_get_debug_flags (surface->display) & GDK_DEBUG_VULKAN_DISABLE)
     {
       g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
                            _("Vulkan support disabled via GDK_DEBUG"));