From 9462981ab3997782c7bd300c043f7ee9bec20abf Mon Sep 17 00:00:00 2001
From: Nicolas Caramelli <caramelli.devel@gmail.com>
Date: Thu, 19 Nov 2020 09:15:53 +0100
Subject: [PATCH] X11: GLFW_X11_XCB_VULKAN_SURFACE instead of GLFW_X11_XCB

---
 include/GLFW/glfw3.h | 4 ++--
 src/init.c           | 8 +++++---
 src/internal.h       | 4 +++-
 src/x11_init.c       | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index 447070017..ac696cd88 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -1252,9 +1252,9 @@ extern "C" {
 #define GLFW_COCOA_MENUBAR          0x00051002
 /*! @brief X11 specific init hint.
  *
- *  X11 specific [init hint](@ref GLFW_X11_XCB_hint).
+ *  X11 specific [init hint](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint).
  */
-#define GLFW_X11_XCB                0x00051003
+#define GLFW_X11_XCB_VULKAN_SURFACE 0x00052001
 /*! @} */
 
 #define GLFW_DONT_CARE              -1
diff --git a/src/init.c b/src/init.c
index c169c3cbe..bca59baab 100644
--- a/src/init.c
+++ b/src/init.c
@@ -58,7 +58,9 @@ static _GLFWinitconfig _glfwInitHints =
         GLFW_TRUE,  // macOS menu bar
         GLFW_TRUE   // macOS bundle chdir
     },
-    GLFW_TRUE,      // X11 XCB
+    {
+        GLFW_TRUE,  // X11 XCB Vulkan surface
+    },
 };
 
 // Terminate the library
@@ -299,8 +301,8 @@ GLFWAPI void glfwInitHint(int hint, int value)
         case GLFW_COCOA_MENUBAR:
             _glfwInitHints.ns.menubar = value;
             return;
-        case GLFW_X11_XCB:
-            _glfwInitHints.x11_xcb = value;
+        case GLFW_X11_XCB_VULKAN_SURFACE:
+            _glfwInitHints.x11.xcbVulkanSurface = value;
             return;
     }
 
diff --git a/src/internal.h b/src/internal.h
index b68f3fcdc..08d21bfc3 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -248,7 +248,9 @@ struct _GLFWinitconfig
         GLFWbool  menubar;
         GLFWbool  chdir;
     } ns;
-    GLFWbool      x11_xcb;
+    struct {
+        GLFWbool  xcbVulkanSurface;
+    } x11;
 };
 
 // Window configuration
diff --git a/src/x11_init.c b/src/x11_init.c
index 5e1865434..fc9ac427b 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -813,7 +813,7 @@ static GLFWbool initExtensions(void)
                               XkbGroupStateMask, XkbGroupStateMask);
     }
 
-    if (_glfw.hints.init.x11_xcb)
+    if (_glfw.hints.init.x11.xcbVulkanSurface)
     {
 #if defined(__CYGWIN__)
         _glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb-1.so");