Changeset 055750a in opengl-game for vulkan-game.hpp

Timestamp:

Dec 4, 2019, 9:33:43 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

785333b, cf727ca

Parents:

e1308e8

Message:

In VulkanGame, use SSBOs in the ship and scene shaders to store per-object data (currently just the model matrix)

File:

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

vulkan-game.hpp

@@ -35 +35 @@
 };
 
-struct UBO_MvpMat {
-   alignas(16) mat4 model;
+struct UBO_VP_mats {
    alignas(16) mat4 view;
    alignas(16) mat4 proj;
+};
+
+struct SBO_SceneObject {
+   alignas(16) mat4 model;
 };
 
@@ -57 +60 @@
       vec3 cam_pos;
 
-      UBO_MvpMat modelMvpMats;
-      UBO_MvpMat shipMvpMats;
+      UBO_VP_mats object_VP_mats;
+      SBO_SceneObject so_Object;
+
+      UBO_VP_mats ship_VP_mats;
+      SBO_SceneObject so_Ship;
 
       GameGui* gui;
@@ -96 +102 @@
       VkSampler textureSampler;
 
-      // These are currently to store the MVP matrix
-      // I should figure out if it makes sense to use them for other uniforms in the future
-      // If not, I should rename them to better indicate their purpose.
-      vector<VkBuffer> uniformBuffers;
-      vector<VkDeviceMemory> uniformBuffersMemory;
-
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList;
+      // TODO: I should probably rename the uniformBuffer* and storageBuffer*
+      // variables to better reflect the data they hold
+
+      vector<VkBuffer> uniformBuffers_scenePipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
+
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
+
+      vector<VkBuffer> storageBuffers_scenePipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
+
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
 
       vector<VkBuffer> uniformBuffers_shipPipeline;
@@ -108 +119 @@
 
       vector<VkDescriptorBufferInfo> uniformBufferInfoList_shipPipeline;
+
+      vector<VkBuffer> storageBuffers_shipPipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_shipPipeline;
+
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_shipPipeline;
 
       VulkanImage floorTextureImage;
@@ -162 +178 @@
       vector<VertexType> addVertexNormals(vector<VertexType> vertices);
 
-      template<class UniformType>
-      void createUniformBuffers(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
-         vector<VkDescriptorBufferInfo>& bufferInfoList);
+      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
+         vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory, vector<VkDescriptorBufferInfo>& bufferInfoList);
 
       void recreateSwapChain();
@@ -176 +191 @@
             void* pUserData);
 };
-
-template<class UniformType>
-void VulkanGame::createUniformBuffers(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
-      vector<VkDescriptorBufferInfo>& bufferInfoList) {
-   buffers.resize(swapChainImages.size());
-   buffersMemory.resize(swapChainImages.size());
-   bufferInfoList.resize(swapChainImages.size());
-
-   for (size_t i = 0; i < swapChainImages.size(); i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, sizeof(UniformType), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
-         VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-         buffers[i], buffersMemory[i]);
-
-      bufferInfoList[i].buffer = buffers[i];
-      bufferInfoList[i].offset = 0;
-      bufferInfoList[i].range = sizeof(UniformType);
-   }
-}
 
 template<class VertexType>