Changeset 8aa4888 in opengl-game

Timestamp:

Jun 8, 2021, 3:21:53 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

8dcbf62

Parents:

c074f81

Message:

Add buffer usages and memory properties to BufferSet and save them (to help with future recreation) in createBufferSet()

Files:

• sdl-game.cpp (modified) (2 diffs)
• sdl-game.hpp (modified) (4 diffs)
• vulkan-game.cpp (modified) (2 diffs)
• vulkan-game.hpp (modified) (3 diffs)

sdl-game.cpp

@@ -1115 +1115 @@
 }
 
-void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                                  BufferSet& set) {
+   set.usages = usages;
+   set.properties = properties;
+
    set.buffers.resize(swapChainImageCount);
    set.memory.resize(swapChainImageCount);
@@ -1122 +1125 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags, properties, set.buffers[i], set.memory[i]);
+      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, usages, properties, set.buffers[i], set.memory[i]);
 
       set.infoSet[i].buffer = set.buffers[i];

sdl-game.hpp

@@ -20 +20 @@
 
 #include "consts.hpp"
+#include "game-gui-sdl.hpp"
 #include "vulkan-utils.hpp"
+#include "graphics-pipeline_vulkan.hpp"
 #include "vulkan-buffer.hpp"
-#include "graphics-pipeline_vulkan.hpp"
-#include "game-gui-sdl.hpp"
 
 using namespace glm;
@@ -59 +59 @@
    unsigned int objIndex;
 };
+
+// Currently using these as the dynamic UBO types as well
+// TODO: Rename them to something more general
 
 struct SSBO_ModelObject {
@@ -83 +86 @@
    vector<VkDeviceMemory> memory;
    vector<VkDescriptorBufferInfo> infoSet;
+   VkBufferUsageFlags usages;
+   VkMemoryPropertyFlags properties;
 };
 
@@ -289 +294 @@
       // TODO: Maybe move these to a different class, possibly VulkanBuffer or some new related class
 
-      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                            BufferSet& set);
 

vulkan-game.cpp

@@ -1942 +1942 @@
 }
 
-void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                                  BufferSet& set) {
+   set.usages = usages;
+   set.properties = properties;
+
    set.buffers.resize(swapChainImageCount);
    set.memory.resize(swapChainImageCount);
@@ -1949 +1952 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags, properties, set.buffers[i], set.memory[i]);
+      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, usages, properties, set.buffers[i], set.memory[i]);
 
       set.infoSet[i].buffer = set.buffers[i];

vulkan-game.hpp

@@ -23 +23 @@
 #include "consts.hpp"
 #include "utils.hpp"
+#include "game-gui-sdl.hpp"
 #include "vulkan-utils.hpp"
+#include "graphics-pipeline_vulkan.hpp"
 #include "vulkan-buffer.hpp"
-#include "graphics-pipeline_vulkan.hpp"
-#include "game-gui-sdl.hpp"
 
 using namespace glm;
@@ -102 +102 @@
    vector<VkDeviceMemory> memory;
    vector<VkDescriptorBufferInfo> infoSet;
+   VkBufferUsageFlags usages;
+   VkMemoryPropertyFlags properties;
 };
 
@@ -427 +429 @@
       // TODO: Maybe move these to a different class, possibly VulkanBuffer or some new related class
 
-      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                            BufferSet& set);