Sfoglia il codice sorgente

Fix X11 WSI extension selection logic

Camilla Berglund 9 anni fa
parent
commit
3b64bae323
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      src/x11_window.c

+ 2 - 2
src/x11_window.c

@@ -2148,7 +2148,7 @@ int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
     VisualID visualID = XVisualIDFromVisual(DefaultVisual(_glfw.x11.display,
     VisualID visualID = XVisualIDFromVisual(DefaultVisual(_glfw.x11.display,
                                                           _glfw.x11.screen));
                                                           _glfw.x11.screen));
 
 
-    if (_glfw.vk.KHR_xcb_surface)
+    if (_glfw.vk.KHR_xcb_surface && _glfw.x11.x11xcb.handle)
     {
     {
         PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR =
         PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR =
             (PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)
             (PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)
@@ -2198,7 +2198,7 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
                                           const VkAllocationCallbacks* allocator,
                                           const VkAllocationCallbacks* allocator,
                                           VkSurfaceKHR* surface)
                                           VkSurfaceKHR* surface)
 {
 {
-    if (_glfw.vk.KHR_xcb_surface)
+    if (_glfw.vk.KHR_xcb_surface && _glfw.x11.x11xcb.handle)
     {
     {
         VkResult err;
         VkResult err;
         VkXcbSurfaceCreateInfoKHR sci;
         VkXcbSurfaceCreateInfoKHR sci;