ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow GEVulkanDynamicBuffer to use a specific frame

Browse Source
This commit is contained in:
Benau 2022-10-11 12:05:47 +08:00
parent f85f631c4b
commit 26f96b0986
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/graphics_engine/src/ge_vulkan_dynamic_buffer.cpp
View File

@ -139,7 +139,8 @@ void GEVulkanDynamicBuffer::destroy()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool GEVulkanDynamicBuffer::setCurrentData(const std::vector< bool GEVulkanDynamicBuffer::setCurrentData(const std::vector<
std::pair<void*, size_t> >& data, std::pair<void*, size_t> >& data,
VkCommandBuffer custom_cmd) VkCommandBuffer custom_cmd,
unsigned cur_frame)
{ {
GEVulkanDriver* vk = getVKDriver(); GEVulkanDriver* vk = getVKDriver();
@ -149,7 +150,12 @@ bool GEVulkanDynamicBuffer::setCurrentData(const std::vector<
bool ret = resizeIfNeeded(size); bool ret = resizeIfNeeded(size);
m_real_size = size; m_real_size = size;
unsigned cur_frame = getVKDriver()->getCurrentFrame(); bool forced_frame = true;
if (cur_frame == (unsigned)-1)
{
cur_frame = vk->getCurrentFrame();
forced_frame = false;
}
if (cur_frame >= m_mapped_addr.size()) if (cur_frame >= m_mapped_addr.size())
cur_frame = 0; cur_frame = 0;
@ -167,7 +173,9 @@ bool GEVulkanDynamicBuffer::setCurrentData(const std::vector<
if (!m_local_buffer.empty()) if (!m_local_buffer.empty())
{ {
unsigned cur_local_frame = getVKDriver()->getCurrentFrame(); unsigned cur_local_frame = vk->getCurrentFrame();
if (forced_frame)
cur_local_frame = cur_frame;
if (cur_local_frame >= m_local_buffer.size()) if (cur_local_frame >= m_local_buffer.size())
cur_local_frame = 0; cur_local_frame = 0;
VkBufferCopy copy_region = {}; VkBufferCopy copy_region = {};

8
lib/graphics_engine/src/ge_vulkan_dynamic_buffer.hpp
View File

@ -42,11 +42,13 @@ public:
~GEVulkanDynamicBuffer(); ~GEVulkanDynamicBuffer();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool setCurrentData(const std::vector<std::pair<void*, size_t> >& data, bool setCurrentData(const std::vector<std::pair<void*, size_t> >& data,
VkCommandBuffer custom_cmd = VK_NULL_HANDLE); VkCommandBuffer custom_cmd = VK_NULL_HANDLE,
unsigned cur_frame = -1);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool setCurrentData(void* data, size_t size, bool setCurrentData(void* data, size_t size,
VkCommandBuffer custom_cmd = VK_NULL_HANDLE) VkCommandBuffer custom_cmd = VK_NULL_HANDLE,
{ return setCurrentData({{ data, size }}, custom_cmd); } unsigned cur_frame = -1)
{ return setCurrentData({{ data, size }}, custom_cmd, cur_frame); }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
VkBuffer getCurrentBuffer() const; VkBuffer getCurrentBuffer() const;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------