Changeset b8072d3 in opengl-game

Timestamp:

May 1, 2021, 6:10:37 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

756162f

Parents:

e8445f0

git-author:

Dmitry Portnoy <dportnoy@…> (04/22/21 02:28:49)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:10:37)

Message:

Add a VkMemoryPropertyFlags parameter to SDLGame::createBufferSet
instead of hard-coding that value

Files:

• compile.sh (modified) (2 diffs)
• sdl-game.cpp (modified) (6 diffs)
• sdl-game.hpp (modified) (3 diffs)

compile.sh

@@ -8 +8 @@
    VULKAN_SDK_PATH=/Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS
 fi
+
+cd shaders
 
 shopt -s nullglob
@@ -22 +24 @@
    glslangValidator -V $f -o $fOut
 done
+
+cd ..

sdl-game.cpp

@@ -78 +78 @@
 
 void VulkanGame::run(int width, int height, unsigned char guiFlags) {
+   cout << "Vulkan Game" << endl;
+
    cout << "DEBUGGING IS " << (ENABLE_VALIDATION_LAYERS ? "ON" : "OFF") << endl;
-
-   cout << "Vulkan Game" << endl;
 
    if (initUI(width, height, guiFlags) == RTWO_ERROR) {
@@ -103 +103 @@
    modelPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ModelVertex::objIndex));
 
-   createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
-      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
+   createBufferSet(uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, sizeof(UBO_VP_mats),
+      VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+      uniformBufferInfoList_modelPipeline);
 
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
@@ -113 +114 @@
 
    SceneObject<ModelVertex, SSBO_ModelObject>* texturedSquare = nullptr;
+
+   // TODO: Ideally, avoid having to make the squares as modified upon creation
 
    texturedSquare = &addObject(modelObjects, modelPipeline,
@@ -1080 +1083 @@
 }
 
-void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
-                                 vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
+void VulkanGame::createBufferSet(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
+                                 VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
                                  vector<VkDescriptorBufferInfo>& bufferInfoList) {
    buffers.resize(swapChainImageCount);
@@ -1088 +1091 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags,
-         VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-         buffers[i], buffersMemory[i]);
+      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags, properties, buffers[i], buffersMemory[i]);
 
       bufferInfoList[i].buffer = buffers[i];
@@ -1229 +1230 @@
    // instead of recreated every time
 
-   createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
-      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
+   createBufferSet(uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, sizeof(UBO_VP_mats),
+      VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+      uniformBufferInfoList_modelPipeline);
 
    modelPipeline.updateRenderPass(renderPass);

sdl-game.hpp

@@ -276 +276 @@
       void cleanupImGuiOverlay();
 
-      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
-         vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
-         vector<VkDescriptorBufferInfo>& bufferInfoList);
+      void createBufferSet(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory, VkDeviceSize bufferSize,
+                           VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+                           vector<VkDescriptorBufferInfo>& bufferInfoList);
 
       // TODO: Since addObject() returns a reference to the new object now,
       // stop using objects.back() to access the object that was just created
       template<class VertexType, class SSBOType>
-      SceneObject<VertexType, SSBOType>& addObject(
-         vector<SceneObject<VertexType, SSBOType>>& objects,
-         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
-         const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
-         bool pipelinesCreated);
+      SceneObject<VertexType, SSBOType>& addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
+                                                   GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
+                                                   const vector<VertexType>& vertices, vector<uint16_t> indices,
+                                                   SSBOType ssbo, bool pipelinesCreated);
 
       template<class VertexType>
@@ -299 +298 @@
 
       template<class VertexType, class SSBOType>
-      void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index);
+      void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects, GraphicsPipeline_Vulkan<VertexType,
+                        SSBOType>& pipeline, size_t index);
 
       void renderFrame(ImDrawData* draw_data);
@@ -458 +457 @@
 // TODO: Just pass in the single object instead of a list of all of them
 template<class VertexType, class SSBOType>
-void VulkanGame::updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-   GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index) {
+void VulkanGame::updateObject(vector<SceneObject<VertexType, SSBOType>>& objects, GraphicsPipeline_Vulkan<VertexType,
+                              SSBOType>& pipeline, size_t index) {
    SceneObject<VertexType, SSBOType>& obj = objects[index];