vulkan: fix wayland create swapchain fail width/height is 0

Author: halx99

axmol/platform/desktop/RenderViewImpl.cpp

@@ -637,17 +637,6 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
     // Init driver after load GL
     axdrv;
     glfwSetWindowUserPointer(_mainWindow, rhi::gl::__state);
-#elif AX_RENDER_API == AX_RENDER_API_VK
-    auto driver = static_cast<ax::rhi::vk::DriverImpl*>(axdrv);
-    bool ok     = driver->setupSurface(_mainWindow, [](VkInstance inst, void* window, VkSurfaceKHR* surface) {
-        return glfwCreateWindowSurface(inst, static_cast<GLFWwindow*>(window), nullptr, surface);
-    });
-    if (!ok)
-    {
-        AXLOGE("Failed to create Vulkan window surface.");
-        return false;
-    }
-    _vkSurface = driver->getSurface();
 #endif
 
     /*
@@ -665,6 +654,22 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
     glfwGetFramebufferSize(_mainWindow, &fbWidth, &fbHeight);
     updateRenderSurface(fbWidth, fbHeight, SurfaceUpdateFlag::RenderSizeChanged | SurfaceUpdateFlag::SilentUpdate);
 
+#if AX_RENDER_API == AX_RENDER_API_VK
+    auto _createSurface = [](VkInstance inst, void* window, VkSurfaceKHR* surface) {
+        return glfwCreateWindowSurface(inst, static_cast<GLFWwindow*>(window), nullptr, surface);
+    };
+    auto driver = static_cast<ax::rhi::vk::DriverImpl*>(axdrv);
+    const rhi::vk::SurfaceCreateInfo createInfo{
+        .window = _mainWindow, .width = fbWidth, .height = fbHeight, .createFunc = _createSurface};
+    bool ok = driver->setupSurface(createInfo);
+    if (!ok)
+    {
+        AXLOGE("Failed to create Vulkan window surface.");
+        return false;
+    }
+    _vkSurface = driver->getSurface();
+#endif
+
     int w, h;
     glfwGetWindowSize(_mainWindow, &w, &h);
     updateScaledWindowSize(w, h, SurfaceUpdateFlag::WindowSizeChanged | SurfaceUpdateFlag::SilentUpdate);

axmol/rhi/vulkan/DriverVK.cpp

@@ -293,17 +293,15 @@ void DriverImpl::initializeFactory()
 #elif AX_TARGET_PLATFORM == AX_PLATFORM_ANDROID
     extensions.push_back("VK_KHR_android_surface");
 #elif AX_TARGET_PLATFORM == AX_PLATFORM_LINUX
-    glfwInit();
-    auto platform = glfwGetPlatform();
-    if (platform == GLFW_PLATFORM_WAYLAND)
+    const char* waylandDisplay = getenv("WAYLAND_DISPLAY");
+    const char* x11Display     = getenv("DISPLAY");
+    if (waylandDisplay)
         extensions.push_back("VK_KHR_wayland_surface");
-    else if (platform == GLFW_PLATFORM_X11)
+    else if (x11Display)
+        extensions.push_back("VK_KHR_xcb_surface");
+    else
     {
-        extensions.push_back("VK_KHR_xcb_surface");  // glfw preferred xcb
-        extensions.push_back("VK_KHR_xlib_surface");
-    }
-    else {
-        AXLOGE("Unsupported window platform: {}", (int)platform);
+        AXLOGE("Unsupported window platform: neither WAYLAND_DISPLAY nor DISPLAY found");
         assert(false);
     }
 #endif
@@ -403,12 +401,15 @@ void DriverImpl::initializeDevice()
              "vkCreateCommandPool failed for transient pool");
 }
 
-bool DriverImpl::setupSurface(void* window, CreateSurfaceFunc func)
+bool DriverImpl::setupSurface(const SurfaceCreateInfo& info)
 {
-    auto result = func(_factory, window, &_surface);
+    auto result = info.createFunc(_factory, info.window, &_surface);
     if (result != VK_SUCCESS)
         return false;
 
+    _surfaceInitalExtent.width = info.width;
+    _surfaceInitalExtent.height = info.height;
+
     uint32_t queueCount = 0;
     vkGetPhysicalDeviceQueueFamilyProperties(_physical, &queueCount, nullptr);
     std::vector<VkQueueFamilyProperties> qprops(queueCount);

axmol/rhi/vulkan/DriverVK.h

@@ -57,6 +57,14 @@ struct DisposableResource
 };
 
 using CreateSurfaceFunc = std::function<VkResult(VkInstance, void* window, VkSurfaceKHR* surface)>;
+struct SurfaceCreateInfo
+{
+    void* window{};
+    int width{0};
+    int height{0};
+    CreateSurfaceFunc createFunc{};
+};
+
 class DriverImpl : public DriverBase
 {
     friend class RenderContextImpl;
@@ -72,9 +80,11 @@ class DriverImpl : public DriverBase
 
     void init();
 
-    bool setupSurface(void* window, CreateSurfaceFunc);
+    bool setupSurface(const SurfaceCreateInfo& info);
     VkSurfaceKHR getSurface() const { return _surface; }
 
+    const VkExtent2D& getInitialSurfaceExtent() const { return _surfaceInitalExtent; }
+
     RenderContext* createRenderContext(void* surfaceContext) override;
     Buffer* createBuffer(std::size_t size, BufferType type, BufferUsage usage, const void* initial) override;
     Texture* createTexture(const TextureDesc& descriptor) override;
@@ -133,6 +143,7 @@ class DriverImpl : public DriverBase
     VkPhysicalDevice _physical{VK_NULL_HANDLE};
     VkDevice _device{VK_NULL_HANDLE};
     VkSurfaceKHR _surface{VK_NULL_HANDLE};
+    VkExtent2D _surfaceInitalExtent{};
 
     VkQueue _graphicsQueue{VK_NULL_HANDLE};
     VkQueue _presentQueue{VK_NULL_HANDLE};

axmol/rhi/vulkan/RenderContextVK.cpp

@@ -97,6 +97,10 @@ RenderContextImpl::RenderContextImpl(DriverImpl* driver, VkSurfaceKHR surface)
     VkResult vr               = vkCreateCommandPool(_device, &poolInfo, nullptr, &_commandPool);
     AXASSERT(vr == VK_SUCCESS, "vkCreateCommandPool failed");
 
+    auto& extent  = driver->getInitialSurfaceExtent();
+    _screenWidth  = extent.width;
+    _screenHeight = extent.height;
+
     createCommandBuffers();
     createDescriptorPool();
     rebuildSwapchain();
@@ -404,7 +408,9 @@ void RenderContextImpl::rebuildSwapchain()
         extent.height = _screenHeight;
     }
     if (extent.width == 0 || extent.height == 0)
-        return;
+    {
+         AXLOGE("axmol: Failed to create swapchain: extent width/height is 0");
+    }
 
     uint32_t imageCount = caps.minImageCount + 1;
     if (caps.maxImageCount > 0 && imageCount > caps.maxImageCount)
@@ -525,7 +531,7 @@ bool RenderContextImpl::beginFrame()
     if (result == VK_SUBOPTIMAL_KHR && !_suboptimal)
     {
         _suboptimal = true;
-        AXLOGW("Vulkan Driver: Suboptimal swap chain.");
+        AXLOGW("axmol: Suboptimal swap chain.");
     }
     AXASSERT(result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR || result == VK_TIMEOUT,
              "vkAcquireNextImageKHR failed");
@@ -630,12 +636,12 @@ void RenderContextImpl::endFrame()
     case VK_SUBOPTIMAL_KHR:
         if (!_suboptimal)
         {
-            AXLOGW("Vulkan Driver: Suboptimal swap chain.");
+            AXLOGW("axmol: Suboptimal swap chain.");
             _suboptimal = true;
         }
         break;
     case VK_ERROR_OUT_OF_DATE_KHR:
-        AXLOGD("Vulkan Driver: swapchain out of date");
+        AXLOGD("axmol: Swapchain out of date");
         break;
     default:
         AXASSERT(vr && false, "vkQueuePresentKHR failed");
@@ -854,12 +860,12 @@ void RenderContextImpl::prepareDrawing()
             imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
             VkWriteDescriptorSet& write = writes.emplace_back();
-            write.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            write.dstSet          = descriptorSets[1];
-            write.dstBinding      = bindingIndex + k;  // preserve shader binding order
-            write.descriptorType  = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-            write.descriptorCount = 1;
-            write.pImageInfo      = &imageInfo;
+            write.sType                 = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+            write.dstSet                = descriptorSets[1];
+            write.dstBinding            = bindingIndex + k;  // preserve shader binding order
+            write.descriptorType        = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+            write.descriptorCount       = 1;
+            write.pImageInfo            = &imageInfo;
         }
     }