diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2023-09-26 21:35:01 -0400 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2023-09-26 21:35:01 -0400 |
| commit | b11ef72f36fa933dd34eb43f53dc15d68ac85ff1 (patch) | |
| tree | e6717ee7bca97deda005900459b8d03d766a0cbc /src | |
| parent | f0e3999bbc20cd72fe1f50539e3b523325b0db16 (diff) | |
expose UniformBuffers
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.cpp | 15 | ||||
| -rw-r--r-- | src/window.hpp | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/window.cpp b/src/window.cpp index f567820..8934184 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -80,7 +80,8 @@ UniformBufferObject UBO{ .proj = glm::mat4(1), }; VkDeviceMemory uniformBufferMemory; -VkBuffer uniformBuffers[MAX_FRAMES_IN_FLIGHT]; +// public +VkBuffer UniformBuffers[MAX_FRAMES_IN_FLIGHT]; /* * ImGui @@ -1174,10 +1175,10 @@ void CreateUniformBuffers() { vkBufferCreateInfo.queueFamilyIndexCount = graphicsFamilyIndex == transferFamilyIndex ? 1 : 2; vkBufferCreateInfo.pQueueFamilyIndices = queueFamilyIndexes; - vkCreateBuffer(vkDevice, &vkBufferCreateInfo, vkAllocator, &uniformBuffers[0]); + vkCreateBuffer(vkDevice, &vkBufferCreateInfo, vkAllocator, &UniformBuffers[0]); VkMemoryRequirements memReqs; - vkGetBufferMemoryRequirements(vkDevice, uniformBuffers[0], &memReqs); + vkGetBufferMemoryRequirements(vkDevice, UniformBuffers[0], &memReqs); VkMemoryAllocateInfo vkMemoryAllocateInfo; vkMemoryAllocateInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; @@ -1187,12 +1188,12 @@ void CreateUniformBuffers() { vkAllocateMemory(vkDevice, &vkMemoryAllocateInfo, vkAllocator, &uniformBufferMemory); - vkDestroyBuffer(vkDevice, uniformBuffers[0], vkAllocator); + vkDestroyBuffer(vkDevice, UniformBuffers[0], vkAllocator); vkBufferCreateInfo.size = memReqs.size; for (long i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i) { - vkCreateBuffer(vkDevice, &vkBufferCreateInfo, vkAllocator, &uniformBuffers[i]); - vkBindBufferMemory(vkDevice, uniformBuffers[i], uniformBufferMemory, memReqs.size * i); + vkCreateBuffer(vkDevice, &vkBufferCreateInfo, vkAllocator, &UniformBuffers[i]); + vkBindBufferMemory(vkDevice, UniformBuffers[i], uniformBufferMemory, memReqs.size * i); } } @@ -1513,7 +1514,7 @@ void DestroyWindow() { ImGui::DestroyContext(); DestroySwapchain(); for (long i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i) { - vkDestroyBuffer(vkDevice, uniformBuffers[i], vkAllocator); + vkDestroyBuffer(vkDevice, UniformBuffers[i], vkAllocator); vkDestroySemaphore(vkDevice, presentImageAvailableSemaphores[i], vkAllocator); vkDestroySemaphore(vkDevice, presentRenderFinishedSemaphores[i], vkAllocator); vkDestroyFence(vkDevice, presentInFlightFences[i], vkAllocator); diff --git a/src/window.hpp b/src/window.hpp index 1ca4dc8..91a3a30 100644 --- a/src/window.hpp +++ b/src/window.hpp @@ -52,6 +52,7 @@ struct UniformBufferObject { glm::mat4 proj; }; extern UniformBufferObject UBO; +extern VkBuffer UniformBuffers[MAX_FRAMES_IN_FLIGHT]; void CreateWindow(PKEWindowProperties *wp); void DestroyWindow(); |