zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-04 01:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- create helper function for copying

Browse source
This commit is contained in:
Magnus Norddahl 2019-03-01 20:15:56 +01:00
parent ee8349d168
commit d73b0b3146
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,16 @@ void VkRenderState::EnableLineSmooth(bool on)
{ {
} }
template<typename T>
static void CopyToBuffer(uint32_t &offset, const T &data, VKDataBuffer *buffer)
{
if (offset + (UniformBufferAlignment<T>() << 1) < buffer->Size())
{
offset += UniformBufferAlignment<T>();
memcpy(static_cast<uint8_t*>(buffer->Memory()) + offset, &data, sizeof(T));
}
}
void VkRenderState::Apply(int dt) void VkRenderState::Apply(int dt)
{ {
auto fb = GetVulkanFrameBuffer(); auto fb = GetVulkanFrameBuffer();
@ -335,23 +345,9 @@ void VkRenderState::Apply(int dt)
mPushConstants.uLightIndex = screen->mLights->BindUBO(mLightIndex); mPushConstants.uLightIndex = screen->mLights->BindUBO(mLightIndex);
if (mMatricesOffset + UniformBufferAlignment<MatricesUBO>() < fb->MatricesUBO->Size()) CopyToBuffer(mMatricesOffset, mMatrices, fb->MatricesUBO);
{ CopyToBuffer(mColorsOffset, mColors, fb->ColorsUBO);
mMatricesOffset += UniformBufferAlignment<MatricesUBO>(); CopyToBuffer(mGlowingWallsOffset, mGlowingWalls, fb->GlowingWallsUBO);
memcpy(static_cast<uint8_t*>(fb->MatricesUBO->Memory()) + mMatricesOffset, &mMatrices, sizeof(MatricesUBO));
}
if (mColorsOffset + UniformBufferAlignment<ColorsUBO>() < fb->ColorsUBO->Size())
{
mColorsOffset += UniformBufferAlignment<ColorsUBO>();
memcpy(static_cast<uint8_t*>(fb->ColorsUBO->Memory()) + mColorsOffset, &mColors, sizeof(ColorsUBO));
}
if (mColorsOffset + UniformBufferAlignment<GlowingWallsUBO>() < fb->GlowingWallsUBO->Size())
{
mGlowingWallsOffset += UniformBufferAlignment<GlowingWallsUBO>();
memcpy(static_cast<uint8_t*>(fb->GlowingWallsUBO->Memory()) + mGlowingWallsOffset, &mGlowingWalls, sizeof(GlowingWallsUBO));
}
mCommandBuffer->pushConstants(passManager->PipelineLayout.get(), VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, (uint32_t)sizeof(PushConstants), &mPushConstants); mCommandBuffer->pushConstants(passManager->PipelineLayout.get(), VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, (uint32_t)sizeof(PushConstants), &mPushConstants);