Changeset 8b823e7 in opengl-game for vulkan-game.cpp

Timestamp:

Jan 24, 2021, 11:38:43 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

d8cf709

Parents:

ce9dc9f

Message:

Create an error-checking macro to check Vulkan function results, which will print a custom message, the error code, and the line number for all results besides VK_SUCCESS, and update the imgui error-checking callback with similar functionality.

File:

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

vulkan-game.cpp

@@ -38 +38 @@
  */
 
-// Put in here to use for IMGUI, but I might use something similar in other places as well
-static void check_vk_result(VkResult result) {
-   if (result == VK_SUCCESS)
+static void check_imgui_vk_result(VkResult res) {
+   if (res == VK_SUCCESS) {
       return;
-   fprintf(stderr, "[vulkan] Error: VkResult = %d\n", result);
-   if (result < 0)
-      abort();
+   }
+
+   ostringstream oss;
+   oss << "[imgui] Vulkan error! VkResult is \"" << VulkanUtils::resultString(res) << "\"" << __LINE__;
+   if (res < 0) {
+      throw runtime_error("Fatal: " + oss.str());
+   } else {
+      cerr << oss.str();
+   }
 }
 
@@ -251 +256 @@
    init_info.MinImageCount = this->swapChainMinImageCount;
    init_info.ImageCount = this->swapChainImageCount;
-   init_info.CheckVkResultFn = check_vk_result;
+   init_info.CheckVkResultFn = check_imgui_vk_result;
    ImGui_ImplVulkan_Init(&init_info, this->renderPass);
 
@@ -261 +266 @@
    // Upload Fonts
    {
-      VkResult err;
-
       VkCommandBuffer command_buffer;
 
@@ -271 +274 @@
       info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
       info.commandBufferCount = 1;
-      err = vkAllocateCommandBuffers(this->device, &info, &command_buffer);
-      check_vk_result(err);
+
+      VKUTIL_CHECK_RESULT(vkAllocateCommandBuffers(this->device, &info, &command_buffer),
+         "failed to allocate command buffers!");
 
       //err = vkResetCommandPool(this->device, command_pool, 0); // Probably not really needed here since the command pool is never used before this
@@ -279 +283 @@
       begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
       begin_info.flags |= VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
-      err = vkBeginCommandBuffer(command_buffer, &begin_info);
-      check_vk_result(err);
+      VKUTIL_CHECK_RESULT(vkBeginCommandBuffer(command_buffer, &begin_info),
+         "failed to begin recording command buffer!");
 
       ImGui_ImplVulkan_CreateFontsTexture(command_buffer);
@@ -288 +292 @@
       end_info.commandBufferCount = 1;
       end_info.pCommandBuffers = &command_buffer;
-      err = vkEndCommandBuffer(command_buffer);
-      check_vk_result(err);
-      err = vkQueueSubmit(this->graphicsQueue, 1, &end_info, VK_NULL_HANDLE);
-      check_vk_result(err);
+
+      VKUTIL_CHECK_RESULT(vkEndCommandBuffer(command_buffer),
+         "failed to record command buffer!");
+
+      VKUTIL_CHECK_RESULT(vkQueueSubmit(this->graphicsQueue, 1, &end_info, VK_NULL_HANDLE),
+         "failed to submit draw command buffer!");
 
       if (vkDeviceWaitIdle(this->device) != VK_SUCCESS) {
@@ -300 +306 @@
 
       // This should make the command pool reusable for later
-      err = vkResetCommandPool(this->device, resourceCommandPool, 0);
-      check_vk_result(err);
+      VKUTIL_CHECK_RESULT(vkResetCommandPool(this->device, resourceCommandPool, 0),
+         "failed to reset command pool!");
    }