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

Timestamp:

Jan 2, 2021, 4:07:45 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl, master

Children:

3b7d497, ca188cc

Parents:

a2f62d7

Message:

Make some minor updates to VulkanGame

File:

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

vulkan-game.cpp

@@ -5 +5 @@
 #include <numeric>
 #include <set>
-
-#include "consts.hpp"
+#include <stdexcept>
+
 #include "logger.hpp"
 
@@ -16 +16 @@
 using namespace std;
 
-// TODO: Update all occurances of instance variables to use this->
+// TODO: Update all occurances of instance variables to use this-> (Actually, not sure if I really want to do this)
+
+/* TODO: Try doing the following tasks based on the Vulkan implementation of IMGUI (Also maybe looks at Sascha Willems' code to see how he does these things)
+ *
+ * - When recreating the swapchain, pass the old one in and destroy the old one after the new one is created
+ * - Recreate semaphores when recreating the swapchain
+ *     - imgui uses one image acquired and one render complete sem  and once fence per frame\
+ * - IMGUI creates one command pool per framebuffer
+ */
 
 VulkanGame::VulkanGame(int maxFramesInFlight) : MAX_FRAMES_IN_FLIGHT(maxFramesInFlight) {
    this->gui = nullptr;
    this->window = nullptr;
+
+   this->debugMessenger = VK_NULL_HANDLE;
 
    this->currentFrame = 0;
@@ -85 +95 @@
 
    // TODO: Refactor the logger api to be more flexible,
-   // esp. since gl_log() and gl_log_err() have issues printing anything besides stirngs
+   // esp. since gl_log() and gl_log_err() have issues printing anything besides strings
    restart_gl_log();
    gl_log("starting SDL\n%s.%s.%s",
@@ -93 +103 @@
 
    // TODO: Use open_Log() and related functions instead of gl_log ones
+   // TODO: In addition, delete the gl_log functions
    open_log();
    get_log() << "starting SDL" << endl;
@@ -807 +818 @@
    }
 
+   // TODO: Should probably check the returned result
    vkDeviceWaitIdle(device);
 }
@@ -1131 +1143 @@
 }
 
-void VulkanGame::createVulkanInstance(const vector<const char*> &validationLayers) {
+void VulkanGame::createVulkanInstance(const vector<const char*>& validationLayers) {
    if (ENABLE_VALIDATION_LAYERS && !VulkanUtils::checkValidationLayerSupport(validationLayers)) {
       throw runtime_error("validation layers requested, but not available!");
@@ -1181 +1193 @@
 
 void VulkanGame::setupDebugMessenger() {
-   if (!ENABLE_VALIDATION_LAYERS) return;
+   if (!ENABLE_VALIDATION_LAYERS) {
+      return;
+   }
 
    VkDebugUtilsMessengerCreateInfoEXT createInfo;
@@ -1217 +1231 @@
 void VulkanGame::pickPhysicalDevice(const vector<const char*>& deviceExtensions) {
    uint32_t deviceCount = 0;
+   // TODO: Check VkResult
    vkEnumeratePhysicalDevices(instance, &deviceCount, nullptr);
 
@@ -1224 +1239 @@
 
    vector<VkPhysicalDevice> devices(deviceCount);
+   // TODO: Check VkResult
    vkEnumeratePhysicalDevices(instance, &deviceCount, devices.data());
 
@@ -1262 +1278 @@
 }
 
-void VulkanGame::createLogicalDevice(
-      const vector<const char*> validationLayers, const vector<const char*>& deviceExtensions) {
+void VulkanGame::createLogicalDevice(const vector<const char*>& validationLayers,
+      const vector<const char*>& deviceExtensions) {
    QueueFamilyIndices indices = VulkanUtils::findQueueFamilies(physicalDevice, surface);
 
@@ -1285 +1301 @@
    VkDeviceCreateInfo createInfo = {};
    createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
+
    createInfo.queueCreateInfoCount = static_cast<uint32_t>(queueCreateInfoList.size());
    createInfo.pQueueCreateInfos = queueCreateInfoList.data();
@@ -1317 +1334 @@
    VkExtent2D extent = VulkanUtils::chooseSwapExtent(swapChainSupport.capabilities, gui->getWindowWidth(), gui->getWindowHeight());
 
-   uint32_t imageCount = swapChainSupport.capabilities.minImageCount + 1;
-   if (swapChainSupport.capabilities.maxImageCount > 0 && imageCount > swapChainSupport.capabilities.maxImageCount) {
-      imageCount = swapChainSupport.capabilities.maxImageCount;
+   swapChainImageCount = swapChainSupport.capabilities.minImageCount + 1;
+   if (swapChainSupport.capabilities.maxImageCount > 0 && swapChainImageCount > swapChainSupport.capabilities.maxImageCount) {
+      swapChainImageCount = swapChainSupport.capabilities.maxImageCount;
    }
 
@@ -1325 +1342 @@
    createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
    createInfo.surface = surface;
-   createInfo.minImageCount = imageCount;
+   createInfo.minImageCount = swapChainImageCount;
    createInfo.imageFormat = surfaceFormat.format;
    createInfo.imageColorSpace = surfaceFormat.colorSpace;
@@ -1355 +1372 @@
    }
 
-   vkGetSwapchainImagesKHR(device, swapChain, &imageCount, nullptr);
-   swapChainImages.resize(imageCount);
-   vkGetSwapchainImagesKHR(device, swapChain, &imageCount, swapChainImages.data());
+   vkGetSwapchainImagesKHR(device, swapChain, &swapChainImageCount, nullptr);
+   swapChainImages.resize(swapChainImageCount);
+   vkGetSwapchainImagesKHR(device, swapChain, &swapChainImageCount, swapChainImages.data());
 
    swapChainImageFormat = surfaceFormat.format;