Changeset 6486ba8 in opengl-game for vulkan-buffer.hpp

Timestamp:

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

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

5ea0a37

Parents:

c1ec4f6

Message:

Rewrite some parts of SDLGame and VulkanGame to store per-object buffer object
data contiguously and copied to the GPU in one call

• Recreate SSBOs when the swapchain is recreated
• implement the ability to add objects to and retrieve objects from the VulkanBuffer class
• remove the ssbo field from the SceneObject class and instead use VulkanBuffer to store per-object data
• rewrite EffectOverTime to work with a VulkanBuffer instance instead of an array of SceneObjects.

File:

• vulkan-buffer.hpp (modified) (10 diffs)

vulkan-buffer.hpp

@@ -33 +33 @@
       void resize();
 
+      T& get(uint32_t index);
       void add(T obj);
 
@@ -41 +42 @@
       size_t alignment;
       size_t range;
+      //size_t capacity;
       size_t numObjects;
 
-      T* srcData; // TODO: Rename this to something else probably and rename rawData to data
-      vector<T>* vData;
-
-      // Remember that this is a pointer to the mapped video memory
-      // Maybe rename it to mappedData or something to make that clearer
-      void* rawData;
+      T* rawData;
+      vector<void*> mappedData;
 
       size_t memRequirement(size_t capacity);
+      size_t memOffset(uint32_t index);
 };
 
@@ -73 +72 @@
                               , numObjects(0)
                               , resized(false)
-                              , srcData(nullptr)
                               , rawData(nullptr)
-                              , vData(nullptr) {
+                              , mappedData() {
 }
 
@@ -85 +83 @@
                               , numObjects(0)
                               , resized(false)
-                              , srcData(nullptr)
                               , rawData(nullptr)
-                              , vData(nullptr) {
+                              , mappedData() {
    if (minOffsetAlignment > 0) {
       alignment = (alignment + minOffsetAlignment - 1) & ~(minOffsetAlignment - 1);
    }
 
-   srcData = (T*)malloc(memRequirement(capacity));
+   rawData = (T*)malloc(memRequirement(capacity));
 }
 
@@ -102 +99 @@
 template<class T>
 VulkanBuffer<T>::~VulkanBuffer() {
-   if (srcData != nullptr) {
-      free(srcData);
+   if (rawData != nullptr) {
+      free(rawData);
    }
 }
@@ -117 +114 @@
       range = other.range;
 
-      if (srcData != nullptr) {
-         free(srcData);
+      if (rawData != nullptr) {
+         free(rawData);
       }
 
-      srcData = other.srcData;
+      rawData = other.rawData;
 
       other.capacity = 0;
@@ -127 +124 @@
       other.range = 0;
 
-      other.srcData = nullptr;
+      other.rawData = nullptr;
    }
 
@@ -139 +136 @@
 
 template<class T>
+T& VulkanBuffer<T>::get(uint32_t index) {
+   // TODO: Check that index < numObjects
+
+   T* obj = (T*)((size_t)rawData + memOffset(index));
+   return *obj;
+}
+
+template<class T>
 void VulkanBuffer<T>::add(T obj) {
    if (numObjects == capacity) {
@@ -144 +149 @@
       resized = true;
 
+      size_t oldMemReq = memRequirement(capacity);
+
       capacity *= 2;
+
+      size_t newMemReq = memRequirement(capacity);
+
+      T* newData = (T*)malloc(newMemReq);
+      // TODO: Check for failure
+
+      memcpy(newData, rawData, oldMemReq);
+
+      free(rawData);
+      rawData = newData;
    }
+
+   T* ptr = (T*)((size_t)rawData + memOffset(numObjects));
+   *ptr = obj;
 
    numObjects++;
@@ -160 +180 @@
 }
 
+template<class T>
+size_t VulkanBuffer<T>::memOffset(uint32_t index) {
+   return (index / range) * alignment + (index % range) * sizeof(T);
+}
+
 #endif // _VULKAN_BUFFER_H