Changeset b3671b5 in opengl-game for vulkan-game.cpp

Timestamp:

Jul 8, 2019, 9:03:04 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1c6cd5e

Parents:

909b51a

Message:

Create a window surface and presentation queue

File:

• vulkan-game.cpp (modified) (12 diffs)

vulkan-game.cpp

@@ -13 +13 @@
 #include <iostream>
 #include <vector>
+#include <set>
 #include <stdexcept>
 #include <cstdlib>
@@ -37 +38 @@
 struct QueueFamilyIndices {
     optional<uint32_t> graphicsFamily;
+    optional<uint32_t> presentFamily;
 
     bool isComplete() {
-        return graphicsFamily.has_value();
+        return graphicsFamily.has_value() && presentFamily.has_value();
     }
 };
@@ -94 +96 @@
       VkInstance instance;
       VkDebugUtilsMessengerEXT debugMessenger;
+      VkSurfaceKHR surface;
+
       VkPhysicalDevice physicalDevice = VK_NULL_HANDLE;
       VkDevice device;
+
       VkQueue graphicsQueue;
+      VkQueue presentQueue;
 
       // both SDL and GLFW create window functions return NULL on failure
@@ -125 +131 @@
          createInstance();
          setupDebugMessenger();
+         createSurface();
          pickPhysicalDevice();
          createLogicalDevice();
@@ -150 +157 @@
          createInfo.ppEnabledExtensionNames = extensions.data();
 
+         cout << endl << "SDL extensions:" << endl;
+         for (const char* extensionName : extensions) {
+            cout << extensionName << endl;
+         }
+         cout << endl;
+
          VkDebugUtilsMessengerCreateInfoEXT debugCreateInfo;
          if (enableValidationLayers) {
@@ -177 +190 @@
             throw runtime_error("failed to setup debug messenger!");
          }
+      }
+
+      void createSurface() {
+         //SDL_Surface* screenSurface = nullptr;
+
+         if (!SDL_Vulkan_CreateSurface(window, instance, &surface)) {
+            throw runtime_error("failed to create window surface!");
+         }
+
+         /*
+         if (glfwCreateWindowSurface(instance, window, nullptr, &surface) != VK_SUCCESS) {
+            throw runtime_error("failed to create window surface!");
+         }
+         */
       }
 
@@ -221 +248 @@
          QueueFamilyIndices indices = findQueueFamilies(physicalDevice);
 
-         VkDeviceQueueCreateInfo queueCreateInfo = {};
-         queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
-         queueCreateInfo.queueFamilyIndex = indices.graphicsFamily.value();
-         queueCreateInfo.queueCount = 1;
+         vector<VkDeviceQueueCreateInfo> queueCreateInfos;
+         set<uint32_t> uniqueQueueFamilies = {indices.graphicsFamily.value(), indices.presentFamily.value()};
 
          float queuePriority = 1.0f;
-         queueCreateInfo.pQueuePriorities = &queuePriority;
+         for (uint32_t queueFamily : uniqueQueueFamilies) {
+            VkDeviceQueueCreateInfo queueCreateInfo = {};
+
+            queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+            queueCreateInfo.queueFamilyIndex = queueFamily;
+            queueCreateInfo.queueCount = 1;
+            queueCreateInfo.pQueuePriorities = &queuePriority;
+
+            queueCreateInfos.push_back(queueCreateInfo);
+         }
 
          VkPhysicalDeviceFeatures deviceFeatures = {};
@@ -234 +268 @@
          createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
 
-         createInfo.pQueueCreateInfos = &queueCreateInfo;
-         createInfo.queueCreateInfoCount = 1;
+         createInfo.queueCreateInfoCount = static_cast<uint32_t>(queueCreateInfos.size());;
+         createInfo.pQueueCreateInfos = queueCreateInfos.data();
 
          createInfo.pEnabledFeatures = &deviceFeatures;
@@ -255 +289 @@
 
          vkGetDeviceQueue(device, indices.graphicsFamily.value(), 0, &graphicsQueue);
+         vkGetDeviceQueue(device, indices.presentFamily.value(), 0, &presentQueue);
       }
 
@@ -295 +330 @@
             if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
                indices.graphicsFamily = i;
+            }
+
+            VkBool32 presentSupport = false;
+            vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
+
+            if (queueFamily.queueCount > 0 && presentSupport) {
+               indices.presentFamily = i;
             }
 
@@ -335 +377 @@
 
          /*
-         SDL_Surface* screenSurface = nullptr;
-         VkSurfaceKHR surface;
-
-         if (!SDL_Vulkan_CreateSurface(window, instance, &surface)) {
-            cout << "Couild not create Vulkan surface" << endl;
-         }
-
          screenSurface = SDL_GetWindowSurface(window);
          cout << "Got here" << endl;
@@ -375 +410 @@
          }
 
+         vkDestroySurfaceKHR(instance, surface, nullptr);
          vkDestroyInstance(instance, nullptr);