Changeset 5ea0a37 in opengl-game for vulkan-game.cpp

Timestamp:

Jun 11, 2021, 10:05:25 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

90880fb

Parents:

6486ba8

Message:

Add a function to VulkanBuffer to return a pointer to the buffer memory, and replace the use of updateBufferSet with copyDataToMemory to update all the data for a single pipeline in one call

File:

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

vulkan-game.cpp

@@ -1022 +1022 @@
 
    // TODO: Probably move the resizing to the VulkanBuffer class
-
-   // TODO: Replace updateBufferSet to one call to copyDataToMemory, using VulkanBuffer to provide the data source
    // TODO: Figure out a way to make updateDescriptorInfo easier to use, maybe store the binding index in the buffer set
 
@@ -1046 +1044 @@
       objData.model = obj.model_transform * obj.model_base;
       obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-      updateBufferSet(storageBuffers_modelPipeline, i, objData);
-   }
+   }
+
+   VulkanUtils::copyDataToMemory(device, objects_modelPipeline.data(), storageBuffers_modelPipeline.memory[imageIndex],
+                                 0, objects_modelPipeline.memorySize(), false);
 
    if (objects_shipPipeline.resized) {
@@ -1066 +1065 @@
       objData.model = obj.model_transform * obj.model_base;
       obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-      updateBufferSet(storageBuffers_shipPipeline, i, objData);
-   }
+   }
+
+   VulkanUtils::copyDataToMemory(device, objects_shipPipeline.data(), storageBuffers_shipPipeline.memory[imageIndex],
+                                 0, objects_shipPipeline.memorySize(), false);
 
    if (objects_asteroidPipeline.resized) {
@@ -1108 +1108 @@
          objData.model = obj.model_transform * obj.model_base;
          obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         updateBufferSet(storageBuffers_asteroidPipeline, i, objData);
       }
    }
+
+   VulkanUtils::copyDataToMemory(device, objects_asteroidPipeline.data(), storageBuffers_asteroidPipeline.memory[imageIndex],
+                                 0, objects_asteroidPipeline.memorySize(), false);
 
    if (objects_laserPipeline.resized) {
@@ -1135 +1136 @@
       objData.model = obj.model_transform * obj.model_base;
       obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-      updateBufferSet(storageBuffers_laserPipeline, i, objData);
-   }
+   }
+
+   VulkanUtils::copyDataToMemory(device, objects_laserPipeline.data(), storageBuffers_laserPipeline.memory[imageIndex],
+                                 0, objects_laserPipeline.memorySize(), false);
 
    if (objects_explosionPipeline.resized) {
@@ -1160 +1162 @@
       objData.model = obj.model_transform * obj.model_base;
       obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-      updateBufferSet(storageBuffers_explosionPipeline, i, objData);
-   }
+   }
+
+   VulkanUtils::copyDataToMemory(device, objects_explosionPipeline.data(), storageBuffers_explosionPipeline.memory[imageIndex],
+                                 0, objects_explosionPipeline.memorySize(), false);
 
    explosion_UBO.cur_time = curTime;