Replace GLFW window with Qt window

GLFW window is replaced with a custom QWindow but it just displays the image. resizability and cleanup are not implemented.

VkTest.pro

@@ -1,4 +1,4 @@
-QT += core xml x11extras
+QT += core xml x11extras gui
 
 CONFIG += c++17
 

VkTest.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.1, 2024-11-18T17:14:40. -->
+<!-- Written by QtCreator 4.10.1, 2024-11-18T18:35:13. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -623,8 +623,8 @@
     <valuelist type="QVariantList" key="Android.PreStartShellCmdListKey"/>
     <value type="int" key="PE.EnvironmentAspect.Base">0</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">VkTest</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">VkTest</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:/home/ali-mehrabani/Qt_projects/VkTest/VkTest.pro</value>
     <value type="QString" key="RunConfiguration.Arguments"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>

VulkanTutorial1.0/ComputeAndGraphics.cpp

@@ -46,23 +46,27 @@ ComputeAndGraphics::ComputeAndGraphics()
 
 void ComputeAndGraphics::run()
 {
-    initWindow();
+//    initWindow();
+
     initVulkan();
     mainLoop();
-    cleanup();
+//    cleanup();
 }
 
-void ComputeAndGraphics::initWindow()
+void ComputeAndGraphics::initWindow(VulkanWindow* window)
 {
-    glfwInit();
+//    glfwInit();
+
+//    glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
 
-    glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
+//    _window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
 
-    _window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
 //    glfwSetWindowUserPointer(_window, this);
 //    glfwSetFramebufferSizeCallback(_window, framebufferResizeCallback);
 
-//    window =
+//    VulkanWindow window;
+    window->resize(800, 600);
+    _windowQt = window;
 }
 
 //void ComputeAndGraphics::framebufferResizeCallback(GLFWwindow* window, int /*width*/, int /*height*/) {
@@ -236,9 +240,11 @@ void ComputeAndGraphics::setupDebugMessenger() {
 
 void ComputeAndGraphics::createSurface()
 {
-    if (glfwCreateWindowSurface(_instance, _window, nullptr, &_surface) != VK_SUCCESS) {
-        throw std::runtime_error("failed to create window surface!");
-    }
+//    if (glfwCreateWindowSurface(_instance, _window, nullptr, &_surface) != VK_SUCCESS) {
+//        throw std::runtime_error("failed to create window surface!");
+//    }
+
+    _windowQt->createVulkanSurface(_instance, _surface);
 }
 
 void ComputeAndGraphics::pickPhysicalDevice() {
@@ -569,7 +575,9 @@ VkExtent2D ComputeAndGraphics::chooseSwapExtent(const VkSurfaceCapabilitiesKHR&
         return capabilities.currentExtent;
     } else {
         int width, height;
-        glfwGetFramebufferSize(_window, &width, &height);
+//        glfwGetFramebufferSize(_window, &width, &height);
+        width = 800;
+        height = 600;
 
         VkExtent2D actualExtent = {
             static_cast<uint32_t>(width),
@@ -1874,11 +1882,16 @@ void ComputeAndGraphics::createSyncObjects() {
 
 void ComputeAndGraphics::mainLoop()
 {
-    while (!glfwWindowShouldClose(_window)) {
-        glfwPollEvents();
+//    while (!glfwWindowShouldClose(_window)) {
+//        glfwPollEvents();
+//        drawFrame();
+//    }
+
+    while (true) {
         drawFrame();
     }
 
+
     vkDeviceWaitIdle(_device);
 }
 
@@ -2151,12 +2164,12 @@ void ComputeAndGraphics::updateComputeUniformBuffer(uint32_t currentImage)
 }
 
 void ComputeAndGraphics::recreateSwapChain() {
-    int width = 0, height = 0;
-    glfwGetFramebufferSize(_window, &width, &height);
-    while (width == 0 || height == 0) {
-        glfwGetFramebufferSize(_window, &width, &height);
-        glfwWaitEvents();
-    }
+    int width = 800, height = 600;
+//    glfwGetFramebufferSize(_window, &width, &height);
+//    while (width == 0 || height == 0) {
+//        glfwGetFramebufferSize(_window, &width, &height);
+//        glfwWaitEvents();
+//    }
 
     vkDeviceWaitIdle(_device);
 
@@ -2248,9 +2261,9 @@ void ComputeAndGraphics::cleanBase()
 
     vkDestroyInstance(_instance, nullptr);
 
-    glfwDestroyWindow(_window);
+//    glfwDestroyWindow(_window);
 
-    glfwTerminate();
+//    glfwTerminate();
 }
 
 void ComputeAndGraphics::cleanDescriptors()

VulkanTutorial1.0/ComputeAndGraphics.h

@@ -90,6 +90,7 @@ class ComputeAndGraphics
 public:
     ComputeAndGraphics();
     void run();
+    void initWindow(VulkanWindow* window);
 
     // Message Callback
     static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT /*messageSeverity*/,
@@ -105,7 +106,6 @@ public:
 //    static void framebufferResizeCallback(QQuickWindow* window, int width, int height);
 
 private:
-    void initWindow();
     void initVulkan();
     void mainLoop();
     void cleanup();
@@ -316,7 +316,7 @@ private:
     bool framebufferResized = false;
 
     GLFWwindow *_window;
-//    VulkanWindow _window;
+    VulkanWindow* _windowQt;
     VkInstance _instance;
     VkDebugUtilsMessengerEXT _debugMessenger;
     VkPhysicalDevice _physicalDevice;

VulkanTutorial1.0/VulkanWindow.cpp

@@ -7,15 +7,14 @@ VulkanWindow::VulkanWindow()
 //        qCritical() << "Failed to initialize Vulkan instance!";
 //        exit(EXIT_FAILURE);
 //    }
-    createVulkanSurface();
+//    createVulkanSurface();
 }
 
 VulkanWindow::~VulkanWindow() {
 //    cleanup();
 }
 
-void VulkanWindow::createVulkanSurface() {
-        VkSurfaceKHR surface;
+VkSurfaceKHR VulkanWindow::createVulkanSurface(VkInstance instance, VkSurfaceKHR& surface) {
 
 #ifdef Q_OS_LINUX
         VkXcbSurfaceCreateInfoKHR surfaceCreateInfo = {};
@@ -23,7 +22,7 @@ void VulkanWindow::createVulkanSurface() {
         surfaceCreateInfo.connection = QX11Info::connection();
         surfaceCreateInfo.window = static_cast<unsigned int>(winId());
 
-        if (vkCreateXcbSurfaceKHR(_instance, &surfaceCreateInfo, nullptr, &surface) != VK_SUCCESS) {
+        if (vkCreateXcbSurfaceKHR(instance, &surfaceCreateInfo, nullptr, &surface) != VK_SUCCESS) {
             qCritical() << "Failed to create Vulkan surface on Linux.";
             exit(EXIT_FAILURE);
         }
@@ -32,14 +31,14 @@ void VulkanWindow::createVulkanSurface() {
         surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
         surfaceCreateInfo.window = reinterpret_cast<ANativeWindow*>(winId());
 
-        if (vkCreateAndroidSurfaceKHR(_instance, &surfaceCreateInfo, nullptr, &surface) != VK_SUCCESS) {
+        if (vkCreateAndroidSurfaceKHR(instance, &surfaceCreateInfo, nullptr, &surface) != VK_SUCCESS) {
             qCritical() << "Failed to create Vulkan surface on Android.";
             exit(EXIT_FAILURE);
         }
 #endif
     _surface = surface;
     qDebug() << "Vulkan surface created successfully.";
-
+    return _surface;
 }
 
 void VulkanWindow::cleanup() {

VulkanTutorial1.0/VulkanWindow.h

@@ -26,8 +26,9 @@ public:
     VulkanWindow();
     virtual ~VulkanWindow();
 
+    VkSurfaceKHR createVulkanSurface(VkInstance instance, VkSurfaceKHR& surface);
+
 private:
-    void createVulkanSurface();
     void cleanup();
 
     VkSurfaceKHR _surface;

main.cpp

@@ -9,19 +9,28 @@
 #include <stdexcept>
 #include <cstdlib>
 
-int main(int /*argc*/, char */*argv*/[]) {
+#include<QGuiApplication>
 
-//    HelloTriangleApplication app;
-    ComputeAndGraphics app;
+int main(int argc, char *argv[]) {
+
+    QGuiApplication app(argc, argv);
+
+//    HelloTriangleApplication vulkanApp;
+    ComputeAndGraphics vulkanApp;
+    VulkanWindow* window = new VulkanWindow();
+    vulkanApp.initWindow(window);
 //    VkMain vkMain;
 
     try {
-        app.run();
+        window->show();
+        vulkanApp.run();
+
 //        vkMain.mainRun();
     } catch (const std::exception& e) {
         std::cerr << e.what() << std::endl;
         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+//    return EXIT_SUCCESS;
+    return app.exec();
 }