Changeset b01b50c in opengl-game for sdl-game.cpp

Timestamp:

Jun 20, 2021, 9:27:27 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

67527a5

Parents:

2f4ff8c

Message:

Rename all BufferSets named storageBuffers_* to objectBuffers_*

File:

• sdl-game.cpp (modified) (5 diffs)

sdl-game.cpp

@@ -125 +125 @@
                    | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-                   storageBuffers_modelPipeline);
-
-   objects_modelPipeline.map(storageBuffers_modelPipeline.memory, device);
+                   objectBuffers_modelPipeline);
+
+   objects_modelPipeline.map(objectBuffers_modelPipeline.memory, device);
 
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
       VK_SHADER_STAGE_VERTEX_BIT, &uniformBuffers_modelPipeline.infoSet);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-      VK_SHADER_STAGE_VERTEX_BIT, &storageBuffers_modelPipeline.infoSet);
+      VK_SHADER_STAGE_VERTEX_BIT, &objectBuffers_modelPipeline.infoSet);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
       VK_SHADER_STAGE_FRAGMENT_BIT, &floorTextureImageDescriptor);
@@ -457 +457 @@
 
    if (objects_modelPipeline.resized) {
-      objects_modelPipeline.unmap(storageBuffers_modelPipeline.memory, device);
-
-      resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline.memorySize(), resourceCommandPool,
+      objects_modelPipeline.unmap(objectBuffers_modelPipeline.memory, device);
+
+      resizeBufferSet(objectBuffers_modelPipeline, objects_modelPipeline.memorySize(), resourceCommandPool,
                       graphicsQueue, true);
 
-      objects_modelPipeline.map(storageBuffers_modelPipeline.memory, device);
+      objects_modelPipeline.map(objectBuffers_modelPipeline.memory, device);
 
       objects_modelPipeline.resize();
 
-      modelPipeline.updateDescriptorInfo(1, &storageBuffers_modelPipeline.infoSet, swapChainImages.size());
+      modelPipeline.updateDescriptorInfo(1, &objectBuffers_modelPipeline.infoSet, swapChainImages.size());
    }
 
@@ -487 +487 @@
 
    VulkanUtils::copyDataToMappedMemory(device, objects_modelPipeline.data(), objects_modelPipeline.mapped(imageIndex),
-                                       storageBuffers_modelPipeline.memory[imageIndex],
+                                       objectBuffers_modelPipeline.memory[imageIndex],
                                        objects_modelPipeline.memorySize(), true);
 }
@@ -1303 +1303 @@
                    | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
                    VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-                   storageBuffers_modelPipeline);
-
-   objects_modelPipeline.map(storageBuffers_modelPipeline.memory, device);
+                   objectBuffers_modelPipeline);
+
+   objects_modelPipeline.map(objectBuffers_modelPipeline.memory, device);
 
    modelPipeline.updateRenderPass(renderPass);
@@ -1336 +1336 @@
    }
 
-   objects_modelPipeline.unmap(storageBuffers_modelPipeline.memory, device);
-
-   for (size_t i = 0; i < storageBuffers_modelPipeline.buffers.size(); i++) {
-      vkDestroyBuffer(device, storageBuffers_modelPipeline.buffers[i], nullptr);
-      vkFreeMemory(device, storageBuffers_modelPipeline.memory[i], nullptr);
+   objects_modelPipeline.unmap(objectBuffers_modelPipeline.memory, device);
+
+   for (size_t i = 0; i < objectBuffers_modelPipeline.buffers.size(); i++) {
+      vkDestroyBuffer(device, objectBuffers_modelPipeline.buffers[i], nullptr);
+      vkFreeMemory(device, objectBuffers_modelPipeline.memory[i], nullptr);
    }