zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-02 00:43:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- wait for space if the stream buffers are exhausted

Browse source
This commit is contained in:
Magnus Norddahl 2019-06-16 13:05:12 +02:00
parent 240a32f4c8
commit d31dbf14e4
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/rendering/vulkan/renderer/vk_renderstate.cpp
View file

@ -327,6 +327,9 @@ void VkRenderState::ApplyStreamData()
{ {
mDataIndex = 0; mDataIndex = 0;
mStreamDataOffset += sizeof(StreamUBO); mStreamDataOffset += sizeof(StreamUBO);
if (mStreamDataOffset + sizeof(StreamUBO) >= fb->StreamUBO->Size())
WaitForStreamBuffers();
} }
uint8_t *ptr = (uint8_t*)fb->StreamUBO->Memory(); uint8_t *ptr = (uint8_t*)fb->StreamUBO->Memory();
memcpy(ptr + mStreamDataOffset + sizeof(StreamData) * mDataIndex, &mStreamData, sizeof(StreamData)); memcpy(ptr + mStreamDataOffset + sizeof(StreamData) * mDataIndex, &mStreamData, sizeof(StreamData));
@ -420,12 +423,12 @@ void VkRenderState::ApplyMatrices()
{ {
auto fb = GetVulkanFrameBuffer(); auto fb = GetVulkanFrameBuffer();
if (mMatricesOffset + (fb->UniformBufferAlignedSize<MatricesUBO>() << 1) < fb->MatricesUBO->Size()) if (mMatricesOffset + (fb->UniformBufferAlignedSize<MatricesUBO>() << 1) >= fb->MatricesUBO->Size())
{ WaitForStreamBuffers();
mMatricesOffset += fb->UniformBufferAlignedSize<MatricesUBO>(); mMatricesOffset += fb->UniformBufferAlignedSize<MatricesUBO>();
memcpy(static_cast<uint8_t*>(fb->MatricesUBO->Memory()) + mMatricesOffset, &mMatrices, sizeof(MatricesUBO)); memcpy(static_cast<uint8_t*>(fb->MatricesUBO->Memory()) + mMatricesOffset, &mMatrices, sizeof(MatricesUBO));
} }
}
} }
void VkRenderState::ApplyVertexBuffers() void VkRenderState::ApplyVertexBuffers()
@ -481,6 +484,16 @@ void VkRenderState::ApplyDynamicSet()
} }
} }
void VkRenderState::WaitForStreamBuffers()
{
EndRenderPass();
GetVulkanFrameBuffer()->WaitForCommands(false);
mApplyCount = 0;
mStreamDataOffset = 0;
mDataIndex = 0;
mMatricesOffset = 0;
}
void VkRenderState::Bind(int bindingpoint, uint32_t offset) void VkRenderState::Bind(int bindingpoint, uint32_t offset)
{ {
if (bindingpoint == VIEWPOINT_BINDINGPOINT) if (bindingpoint == VIEWPOINT_BINDINGPOINT)

1
src/rendering/vulkan/renderer/vk_renderstate.h
View file

@ -63,6 +63,7 @@ protected:
void ApplyVertexBuffers(); void ApplyVertexBuffers();
void ApplyMaterial(); void ApplyMaterial();
void WaitForStreamBuffers();
void BeginRenderPass(VulkanCommandBuffer *cmdbuffer); void BeginRenderPass(VulkanCommandBuffer *cmdbuffer);
bool mDepthClamp = true; bool mDepthClamp = true;