From 6185c081c1a6ec13b54eab6a12ff72814cf3addb Mon Sep 17 00:00:00 2001
From: Chuyan Zhang <chuyan@ucsb.edu>
Date: Tue, 1 Oct 2024 17:08:41 -0700
Subject: Fix vulkan validation error

---
 src/vulkan_helper.h | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'src/vulkan_helper.h')

diff --git a/src/vulkan_helper.h b/src/vulkan_helper.h
index c2b1c8c..d8c9c32 100644
--- a/src/vulkan_helper.h
+++ b/src/vulkan_helper.h
@@ -2,6 +2,7 @@
 #include <vulkan/vulkan_core.h>
 #include <vulkan/vk_enum_string_helper.h>
 #include <vk_mem_alloc.h>
+#include <spdlog/spdlog.h>
 
 #include <cstdint>
 #include <vector>
@@ -11,8 +12,7 @@
     do {                                                                        \
         VkResult res = result;                                                  \
         if (res != VK_SUCCESS) {                                                \
-            /* TODO: throw error instead of returning */                        \
-            std::cerr << "Vulkan error: " << string_VkResult(res) << std::endl; \
+            spdlog::error("Vulkan error: {}", string_VkResult(res));            \
             abort();                                                            \
         }                                                                       \
     } while (0)                                                
@@ -21,6 +21,7 @@ namespace iris {
 
 struct Buffer_t {
     VkBuffer buffer;
+    VkDevice device;
     VmaAllocator allocator;
     VmaAllocation allocation;
     VkBufferUsageFlags flags;
@@ -30,12 +31,14 @@ struct Buffer_t {
     void* map();
     void unmap();
     void release();
+    ~Buffer_t() { release(); }
 };
 
 typedef std::shared_ptr<Buffer_t> Buffer;
 
 struct Texture2D_t {
     VkImage image;
+    VkDevice device;
     VmaAllocator allocator;
     VmaAllocation allocation;
     VkImageView image_view;
@@ -45,6 +48,7 @@ struct Texture2D_t {
     VkExtent2D extent;
 
     void release();
+    ~Texture2D_t() { release(); }
 };
 
 typedef std::shared_ptr<Texture2D_t> Texture2D;
@@ -62,16 +66,19 @@ struct CommandBuffer {
     void destroy();
     void begin(VkCommandBufferUsageFlags flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
     void submit_sync();
+    ~CommandBuffer() { destroy(); }
 };
 
 struct AsyncCommandBuffer {
     VkDevice device;
     VkCommandPool pool;
     VkCommandBuffer buffer;
+    VkFence fence;
     VkQueue queue;
 
     AsyncCommandBuffer(VkDevice device, uint32_t queue_family_index, VkQueue queue);
     void destroy();
+    ~AsyncCommandBuffer() { destroy(); }
 };
 
 struct Device {
@@ -92,21 +99,6 @@ struct Device {
         std::vector<std::string> instance_extensions);
     void destroy();
 
-    Buffer_t create_buffer_raw(
-        VkDeviceSize size,
-        VkBufferUsageFlags usage,
-        VmaAllocationCreateInfo create_info = {
-            .usage = VMA_MEMORY_USAGE_AUTO,
-        });
-
-    Texture2D_t create_texture_raw(
-        VkExtent2D extent,
-        VkFormat format,
-        VkImageUsageFlags usage,
-        VmaAllocationCreateInfo create_info = {
-            .usage = VMA_MEMORY_USAGE_AUTO,
-        });
-
     Buffer create_buffer(
         VkDeviceSize size,
         VkBufferUsageFlags usage,
-- 
cgit v1.2.3-70-g09d2