Changeset c074f81 in opengl-game

Timestamp:

Jun 8, 2021, 2:29:12 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

8aa4888

Parents:

567fa88

Message:

Change VulkanUtils::copyDataToMemory() to always require a size and to optionally flush the memory. Also add a VulkanUtils::copyDataToMappedMemory function that does the same thing, but assumes the data is already mapped.

Files:

• sdl-game.cpp (modified) (1 diff)
• sdl-game.hpp (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)
• vulkan-game.hpp (modified) (2 diffs)
• vulkan-utils.hpp (modified) (2 diffs)

sdl-game.cpp

@@ -475 +475 @@
    }
 
-   VulkanUtils::copyDataToMemory(device, object_VP_mats, uniformBuffers_modelPipeline.memory[imageIndex], 0);
+   VulkanUtils::copyDataToMemory(device, &object_VP_mats, uniformBuffers_modelPipeline.memory[imageIndex], 0,
+                                 sizeof(object_VP_mats), false);
 }
 

sdl-game.hpp

@@ -383 +383 @@
 void VulkanGame::updateBufferSet(BufferSet& set, size_t objIndex, SSBOType& ssbo) {
    for (size_t i = 0; i < set.memory.size(); i++) {
-      VulkanUtils::copyDataToMemory(device, ssbo, set.memory[i], objIndex * sizeof(SSBOType));
+      VulkanUtils::copyDataToMemory(device, &ssbo, set.memory[i], objIndex * sizeof(SSBOType), sizeof(ssbo), false);
    }
 }

vulkan-game.cpp

@@ -1161 +1161 @@
    explosion_UBO.cur_time = curTime;
 
-   VulkanUtils::copyDataToMemory(device, object_VP_mats, uniformBuffers_modelPipeline.memory[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, ship_VP_mats, uniformBuffers_shipPipeline.memory[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, asteroid_VP_mats, uniformBuffers_asteroidPipeline.memory[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, laser_VP_mats, uniformBuffers_laserPipeline.memory[imageIndex], 0);
-
-   VulkanUtils::copyDataToMemory(device, explosion_UBO, uniformBuffers_explosionPipeline.memory[imageIndex], 0);
+   VulkanUtils::copyDataToMemory(device, &object_VP_mats, uniformBuffers_modelPipeline.memory[imageIndex], 0,
+                                 sizeof(object_VP_mats), false);
+
+   VulkanUtils::copyDataToMemory(device, &ship_VP_mats, uniformBuffers_shipPipeline.memory[imageIndex], 0,
+                                 sizeof(ship_VP_mats), false);
+
+   VulkanUtils::copyDataToMemory(device, &asteroid_VP_mats, uniformBuffers_asteroidPipeline.memory[imageIndex], 0,
+                                 sizeof(asteroid_VP_mats), false);
+
+   VulkanUtils::copyDataToMemory(device, &laser_VP_mats, uniformBuffers_laserPipeline.memory[imageIndex], 0,
+                                 sizeof(laser_VP_mats), false);
+
+   VulkanUtils::copyDataToMemory(device, &explosion_UBO, uniformBuffers_explosionPipeline.memory[imageIndex], 0,
+                                 sizeof(explosion_UBO), false);
 }
 

vulkan-game.hpp

@@ -39 +39 @@
 // TODO: Consider if there is a better way of dealing with all the vertex types and ssbo types, maybe
 // by consolidating some and trying to keep new ones to a minimum
-
-struct OverlayVertex {
-   vec3 pos;
-   vec2 texCoord;
-};
 
 struct ModelVertex {
@@ -546 +541 @@
 void VulkanGame::updateBufferSet(BufferSet& set, size_t objIndex, SSBOType& ssbo) {
    for (size_t i = 0; i < set.memory.size(); i++) {
-      VulkanUtils::copyDataToMemory(device, ssbo, set.memory[i], objIndex * sizeof(SSBOType));
+      VulkanUtils::copyDataToMemory(device, &ssbo, set.memory[i], objIndex * sizeof(SSBOType), sizeof(ssbo), false);
    }
 }

vulkan-utils.hpp

@@ -103 +103 @@
 
       template<class DataType>
-      static void copyDataToMemory(VkDevice device, const DataType& srcData, VkDeviceMemory bufferMemory,
-                                   VkDeviceSize offset);
+      static void copyDataToMemory(VkDevice device, DataType* srcData, VkDeviceMemory bufferMemory,
+                                   VkDeviceSize offset, VkDeviceSize size, bool flush);
 
       template<class DataType>
-      static void copyDataToMemory(VkDevice device, const DataType& srcData, VkDeviceMemory bufferMemory,
-                                   VkDeviceSize offset, VkDeviceSize size);
+      static void copyDataToMappedMemory(VkDevice device, DataType* srcData, void* mappedData,
+                                         VkDeviceMemory bufferMemory, VkDeviceSize size, bool flush);
 
       static bool hasStencilComponent(VkFormat format);
@@ -140 +140 @@
 
 template<class DataType>
-void VulkanUtils::copyDataToMemory(VkDevice device, const DataType& srcData, VkDeviceMemory bufferMemory,
-                                   VkDeviceSize offset) {
-   copyDataToMemory(device, srcData, bufferMemory, offset, sizeof(DataType));
-}
-
-// TODO: This would be used when the GPU memory is host-coherent. If it it not, I also need to use vkFlushMappedMemoryRanges
-// I should create a variant that supports non-coherent memory
-template<class DataType>
-void VulkanUtils::copyDataToMemory(VkDevice device, const DataType& srcData, VkDeviceMemory bufferMemory,
-                                   VkDeviceSize offset, VkDeviceSize size) {
+void VulkanUtils::copyDataToMemory(VkDevice device, DataType* srcData, VkDeviceMemory bufferMemory,
+                                   VkDeviceSize offset, VkDeviceSize size, bool flush) {
    void* data;
 
    vkMapMemory(device, bufferMemory, offset, size, 0, &data);
-   memcpy(data, &srcData, size);
+
+   memcpy(data, srcData, size);
+
+   if (flush) {
+      VkMappedMemoryRange memoryRange{};
+      memoryRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+      memoryRange.memory = bufferMemory;
+      memoryRange.size = size;
+
+      vkFlushMappedMemoryRanges(device, 1, &memoryRange);
+   }
+
    vkUnmapMemory(device, bufferMemory);
+}
+
+template<class DataType>
+void VulkanUtils::copyDataToMappedMemory(VkDevice device, DataType* srcData, void* mappedData,
+                                         VkDeviceMemory bufferMemory, VkDeviceSize size, bool flush) {
+   memcpy(mappedData, srcData, size);
+
+   if (flush) {
+      VkMappedMemoryRange memoryRange{};
+      memoryRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+      memoryRange.memory = bufferMemory;
+      memoryRange.size = size;
+
+      vkFlushMappedMemoryRanges(device, 1, &memoryRange);
+   }
 }