Changeset b7fc3c2 in opengl-game for vulkan-buffer.hpp

Timestamp:

Jun 10, 2021, 2:58:54 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

c1ec4f6

Parents:

bb76950

git-author:

Dmitry Portnoy <dportnoy@…> (06/10/21 14:53:52)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/10/21 14:58:54)

Message:

Modify the VulkanBuffer class to take a range and to align data based on that rather than the size of an individual data item. Also, reorganize the code in VulkanGae::updateScene() in a more logical fashion, and remove VulkanGame::updateObject() and inline its functionality.

File:

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

vulkan-buffer.hpp

@@ -21 +21 @@
 
       VulkanBuffer();
-      VulkanBuffer(size_t capacity, size_t minOffsetAlignment);
+      VulkanBuffer(size_t capacity, size_t range, size_t minOffsetAlignment);
 
       VulkanBuffer(const VulkanBuffer<T>&) = delete;
@@ -35 +35 @@
       void add(T obj);
 
-      // TODO: Add a resize function
+      size_t memorySize();
 
    private:
 
       size_t alignment;
+      size_t range;
       size_t numObjects;
 
@@ -48 +49 @@
       // Maybe rename it to mappedData or something to make that clearer
       void* rawData;
+
+      size_t memRequirement(size_t capacity);
 };
 
@@ -66 +69 @@
 VulkanBuffer<T>::VulkanBuffer()
                               : alignment(0)
+                              , range(0)
                               , capacity(0)
                               , numObjects(0)
@@ -75 +79 @@
 
 template<class T>
-VulkanBuffer<T>::VulkanBuffer(size_t capacity, size_t minOffsetAlignment)
-                              : alignment(sizeof(T))
+VulkanBuffer<T>::VulkanBuffer(size_t capacity, size_t range, size_t minOffsetAlignment)
+                              : alignment(range)
+                              , range(range / sizeof(T))
                               , capacity(capacity)
                               , numObjects(0)
@@ -87 +92 @@
    }
 
-   srcData = (T*)malloc(capacity * alignment);
+   srcData = (T*)malloc(memRequirement(capacity));
 }
 
@@ -110 +115 @@
 
       alignment = other.alignment;
+      range = other.range;
 
       if (srcData != nullptr) {
@@ -119 +125 @@
       other.capacity = 0;
       other.numObjects = 0;
-      // TODO: Maybe set rnage to 0 as well
+      other.range = 0;
 
       other.srcData = nullptr;
@@ -144 +150 @@
 }
 
+template<class T>
+size_t VulkanBuffer<T>::memorySize() {
+   return memRequirement(capacity);
+}
+
+template<class T>
+size_t VulkanBuffer<T>::memRequirement(size_t capacity) {
+   return (capacity / range) * alignment + (capacity % range) * sizeof(T);
+}
+
 #endif // _VULKAN_BUFFER_H