From f6f4f8b7c96dc1f7bc79c3a9f7a97f02729248cb Mon Sep 17 00:00:00 2001 From: Caleb Burke Date: Mon, 5 Oct 2026 02:16:37 -0700 Subject: [PATCH] fixes to buffer class --- engine/src/vulkan/buffer.cpp | 7 ++----- engine/src/vulkan/buffer.hpp | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/engine/src/vulkan/buffer.cpp b/engine/src/vulkan/buffer.cpp index 8054ee1..774eb15 100644 --- a/engine/src/vulkan/buffer.cpp +++ b/engine/src/vulkan/buffer.cpp @@ -36,17 +36,14 @@ Buffer::~Buffer() { vmaDestroyBuffer(this->device.getAllocator(), this->buffer, this->allocation); } -// VMA always maps the whole allocation, so `size` only exists to keep the -// interface; `offset` is applied to the returned pointer. -vk::Result Buffer::map(vk::DeviceSize size, vk::DeviceSize offset) { +vk::Result Buffer::map() { SOPHIA_ASSERT(buffer && allocation, "Called map on buffer before create"); - (void)size; void* base = nullptr; vk::Result result = static_cast( vmaMapMemory(this->device.getAllocator(), this->allocation, &base)); if (result == vk::Result::eSuccess) { - this->mapped = static_cast(base) + offset; + this->mapped = base; } return result; } diff --git a/engine/src/vulkan/buffer.hpp b/engine/src/vulkan/buffer.hpp index f4cfbb1..605a402 100644 --- a/engine/src/vulkan/buffer.hpp +++ b/engine/src/vulkan/buffer.hpp @@ -19,8 +19,7 @@ class Buffer { vk::DeviceSize minOffsetAlignment = 1); ~Buffer(); - vk::Result map(vk::DeviceSize size = VK_WHOLE_SIZE, - vk::DeviceSize offset = 0); + vk::Result map(); void unmap(); void writeToBuffer(void* data, vk::DeviceSize size = VK_WHOLE_SIZE, @@ -41,7 +40,7 @@ class Buffer { void* getMappedMemory() const { return mapped; } uint32_t getInstanceCount() const { return instanceCount; } vk::DeviceSize getInstanceSize() const { return instanceSize; } - vk::DeviceSize getAlignmentSize() const { return instanceSize; } + vk::DeviceSize getAlignmentSize() const { return alignmentSize; } vk::BufferUsageFlags getUsageFlags() const { return usageFlags; } vk::MemoryPropertyFlags getMemoryPropertyFlags() const { return memoryPropertyFlags;