Changeset 5a1ace0 in opengl-game

Timestamp:

Feb 16, 2020, 8:18:50 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

2d87297

Parents:

4ece3bf

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (02/14/20 20:41:35)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (02/16/20 20:18:50)

Message:

In VulkanGame, add objIndex to scene objects, use it in the scene shader to index into the ssbo, and change the code that copies data to the ssbo to do so for each scene object, not just the first one

Files:

• shaders/scene.vert (modified) (2 diffs)
• vulkan-game.cpp (modified) (4 diffs)
• vulkan-game.hpp (modified) (1 diff)
• vulkan-utils.hpp (modified) (2 diffs)

shaders/scene.vert

@@ -18 +18 @@
 layout(location = 1) in vec3 inColor;
 layout(location = 2) in vec2 inTexCoord;
+layout(location = 3) in uint obj_index;
 
 layout(location = 0) out vec3 fragColor;
@@ -26 +27 @@
    fragTexCoord = inTexCoord;
 
-   gl_Position = ubo.proj * ubo.view * sbo.objects[0].model * vec4(inPosition, 1.0);
+   gl_Position = ubo.proj * ubo.view * sbo.objects[obj_index].model * vec4(inPosition, 1.0);
 }

vulkan-game.cpp

@@ -197 +197 @@
    modelPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::color));
    modelPipeline.addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&ModelVertex::texCoord));
+   modelPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ModelVertex::objIndex));
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
@@ -213 +214 @@
 
    addObject(modelObjects, modelPipeline,
-      {
+      addObjectIndex<ModelVertex>(modelObjects.size(), {
          {{-0.5f, -0.5f, -2.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
          {{ 0.5f, -0.5f, -2.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
          {{ 0.5f,  0.5f, -2.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
          {{-0.5f,  0.5f, -2.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
-      }, {
+      }), {
          0, 1, 2, 2, 3, 0
       });
 
    addObject(modelObjects, modelPipeline,
-      {
+      addObjectIndex<ModelVertex>(modelObjects.size(), {
          {{-0.5f, -0.5f, -1.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
          {{ 0.5f, -0.5f, -1.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
          {{ 0.5f,  0.5f, -1.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
          {{-0.5f,  0.5f, -1.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
-      }, {
+      }), {
          0, 1, 2, 2, 3, 0
       });
@@ -699 +700 @@
 
                   addObject(modelObjects, modelPipeline,
-                     {
+                     addObjectIndex<ModelVertex>(modelObjects.size(), {
                         {{-0.5f, -0.5f,  zOffset}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
                         {{ 0.5f, -0.5f,  zOffset}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
                         {{ 0.5f,  0.5f,  zOffset}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
                         {{-0.5f,  0.5f,  zOffset}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
-                     }, {
+                     }), {
                         0, 1, 2, 2, 3, 0
                      });
@@ -774 +775 @@
    so_Asteroid.model = asteroidObjects[0].model_transform * asteroidObjects[0].model_base;
 
-   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], object_VP_mats);
-
-   VulkanUtils::copyDataToMemory(device, storageBuffersMemory_scenePipeline[currentImage], so_Object);
-
-   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_shipPipeline[currentImage], ship_VP_mats);
-
-   VulkanUtils::copyDataToMemory(device, storageBuffersMemory_shipPipeline[currentImage], so_Ship);
-
-   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_asteroidPipeline[currentImage], asteroid_VP_mats);
-
-   VulkanUtils::copyDataToMemory(device, storageBuffersMemory_asteroidPipeline[currentImage], so_Asteroid);
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], 0, object_VP_mats);
+
+   for (size_t i = 0; i < modelObjects.size(); i++) {
+      VulkanUtils::copyDataToMemory(device, storageBuffersMemory_scenePipeline[currentImage],
+         i, so_Object);
+   }
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_shipPipeline[currentImage], 0, ship_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, storageBuffersMemory_shipPipeline[currentImage], 0, so_Ship);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_asteroidPipeline[currentImage], 0, asteroid_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, storageBuffersMemory_asteroidPipeline[currentImage], 0, so_Asteroid);
 }
 

vulkan-game.hpp

@@ -22 +22 @@
 #endif
 
+struct OverlayVertex {
+   vec3 pos;
+   vec2 texCoord;
+};
+
 struct ModelVertex {
    vec3 pos;
    vec3 color;
    vec2 texCoord;
-};
-
-struct OverlayVertex {
-   vec3 pos;
-   vec2 texCoord;
+   unsigned int objIndex;
 };
 

vulkan-utils.hpp

@@ -95 +95 @@
 
       template<class DataType>
-      static void copyDataToMemory(VkDevice device, VkDeviceMemory bufferMemory, const DataType& srcData);
+      static void copyDataToMemory(VkDevice device, VkDeviceMemory bufferMemory, VkDeviceSize offset,
+            const DataType& srcData);
 
       static bool hasStencilComponent(VkFormat format);
@@ -125 +126 @@
 }
 
-// TODO: Change copyDataToMemory so it can accept offsets for the data source and destination
 template<class DataType>
-void VulkanUtils::copyDataToMemory(VkDevice device, VkDeviceMemory bufferMemory, const DataType& srcData) {
+void VulkanUtils::copyDataToMemory(VkDevice device, VkDeviceMemory bufferMemory, VkDeviceSize offset,
+      const DataType& srcData) {
    void* data;
-   vkMapMemory(device, bufferMemory, 0, sizeof(DataType), 0, &data);
+
+   vkMapMemory(device, bufferMemory, offset * sizeof(DataType), sizeof(DataType), 0, &data);
    memcpy(data, &srcData, sizeof(DataType));
    vkUnmapMemory(device, bufferMemory);