Changeset 6a39266 in opengl-game

Timestamp:

Jan 3, 2021, 6:29:50 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

7f60b28

Parents:

6493e43

git-author:

Dmitry Portnoy <dportnoy@…> (01/03/21 18:25:46)

git-committer:

Dmitry Portnoy <dportnoy@…> (01/03/21 18:29:50)

Message:

In vulkan-game, throw an error if either a graphics or present queue could not be found

Files:

• vulkan-game.cpp (modified) (5 diffs)
• vulkan-utils.cpp (modified) (2 diffs)

vulkan-game.cpp

@@ -1 +1 @@
 #include "vulkan-game.hpp"
-
-#include "IMGUI/imgui_impl_sdl.h"
-#include "IMGUI/imgui_impl_vulkan.h"
 
 #include <array>
@@ -9 +6 @@
 #include <set>
 #include <stdexcept>
+
+#include "IMGUI/imgui_impl_sdl.h"
+#include "IMGUI/imgui_impl_vulkan.h"
 
 #include "logger.hpp"
@@ -1368 +1368 @@
 }
 
-bool VulkanGame::isDeviceSuitable(VkPhysicalDevice physicalDevice,
-      const vector<const char*>& deviceExtensions) {
+bool VulkanGame::isDeviceSuitable(VkPhysicalDevice physicalDevice, const vector<const char*>& deviceExtensions) {
    VkPhysicalDeviceProperties deviceProperties;
    vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties);
@@ -1393 +1392 @@
       const vector<const char*>& deviceExtensions) {
    QueueFamilyIndices indices = VulkanUtils::findQueueFamilies(physicalDevice, surface);
+
+   if (!indices.isComplete()) {
+      throw runtime_error("failed to find required queue families!");
+   }
+
+   // TODO: Using separate graphics and present queues currently works, but I should verify that I'm
+   // using them correctly to get the most benefit out of separate queues
 
    vector<VkDeviceQueueCreateInfo> queueCreateInfoList;
@@ -1401 +1407 @@
       VkDeviceQueueCreateInfo queueCreateInfo = {};
       queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+      queueCreateInfo.queueCount = 1;
       queueCreateInfo.queueFamilyIndex = queueFamily;
-      queueCreateInfo.queueCount = 1;
       queueCreateInfo.pQueuePriorities = &queuePriority;
 

vulkan-utils.cpp

@@ -60 +60 @@
 }
 
+// TODO: Change this to prefer one queue that supports both graphics and presentation
 QueueFamilyIndices VulkanUtils::findQueueFamilies(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface) {
    QueueFamilyIndices indices;
@@ -71 +72 @@
    int i = 0;
    for (const auto& queueFamily : queueFamilies) {
-      if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
-         indices.graphicsFamily = i;
-      }
-
-      VkBool32 presentSupport = false;
-      vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice, i, surface, &presentSupport);
-
-      if (queueFamily.queueCount > 0 && presentSupport) {
-         indices.presentFamily = i;
-      }
-
-      if (indices.isComplete()) {
-         break;
+      if (queueFamily.queueCount > 0) {
+         if (queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
+            indices.graphicsFamily = i;
+         }
+
+         VkBool32 presentSupport = false;
+         vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice, i, surface, &presentSupport);
+
+         if (presentSupport) {
+            indices.presentFamily = i;
+         }
+
+         if (indices.isComplete()) {
+            break;
+         }
       }