zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix dynamic buffer offset not getting updated

Browse source 
- fix lightbuffer blocksize being hardcoded
This commit is contained in:
Magnus Norddahl 2019-03-05 02:06:20 +01:00
parent c137e868de
commit 95116e8580
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/vulkan/renderer/vk_renderpass.cpp
View file

@ -161,7 +161,7 @@ void VkRenderPassManager::CreateDynamicSet()
auto fb = GetVulkanFrameBuffer(); auto fb = GetVulkanFrameBuffer();
WriteDescriptors update; WriteDescriptors update;
update.addBuffer(DynamicSet.get(), 0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->ViewpointUBO->mBuffer.get(), 0, sizeof(HWViewpointUniforms)); update.addBuffer(DynamicSet.get(), 0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->ViewpointUBO->mBuffer.get(), 0, sizeof(HWViewpointUniforms));
update.addBuffer(DynamicSet.get(), 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, fb->LightBufferSSO->mBuffer.get(), 0, 4096); update.addBuffer(DynamicSet.get(), 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, fb->LightBufferSSO->mBuffer.get(), 0, fb->GetLightBufferBlockSize());
update.addBuffer(DynamicSet.get(), 2, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->MatricesUBO->mBuffer.get(), 0, sizeof(MatricesUBO)); update.addBuffer(DynamicSet.get(), 2, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->MatricesUBO->mBuffer.get(), 0, sizeof(MatricesUBO));
update.addBuffer(DynamicSet.get(), 3, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->StreamUBO->mBuffer.get(), 0, sizeof(StreamUBO)); update.addBuffer(DynamicSet.get(), 3, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, fb->StreamUBO->mBuffer.get(), 0, sizeof(StreamUBO));
update.updateSets(fb->device); update.updateSets(fb->device);

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

@ -572,7 +572,7 @@ void VkRenderState::ApplyMaterial()
void VkRenderState::ApplyDynamicSet() void VkRenderState::ApplyDynamicSet()
{ {
if (mViewpointOffset != mLastViewpointOffset || mLightBufferOffset != mLastLightBufferOffset) if (mViewpointOffset != mLastViewpointOffset || mLightBufferOffset != mLastLightBufferOffset || mMatricesOffset != mLastMatricesOffset || mStreamDataOffset != mLastStreamDataOffset)
{ {
auto fb = GetVulkanFrameBuffer(); auto fb = GetVulkanFrameBuffer();
auto passManager = fb->GetRenderPassManager(); auto passManager = fb->GetRenderPassManager();
@ -582,6 +582,8 @@ void VkRenderState::ApplyDynamicSet()
mLastViewpointOffset = mViewpointOffset; mLastViewpointOffset = mViewpointOffset;
mLastLightBufferOffset = mLightBufferOffset; mLastLightBufferOffset = mLightBufferOffset;
mLastMatricesOffset = mMatricesOffset;
mLastStreamDataOffset = mStreamDataOffset;
} }
} }

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

@ -86,6 +86,8 @@ private:
uint32_t mLastViewpointOffset = 0xffffffff; uint32_t mLastViewpointOffset = 0xffffffff;
uint32_t mLastLightBufferOffset = 0xffffffff; uint32_t mLastLightBufferOffset = 0xffffffff;
uint32_t mLastMatricesOffset = 0xffffffff;
uint32_t mLastStreamDataOffset = 0xffffffff;
uint32_t mViewpointOffset = 0; uint32_t mViewpointOffset = 0;
uint32_t mLightBufferOffset = 0; uint32_t mLightBufferOffset = 0;
uint32_t mMatricesOffset = 0; uint32_t mMatricesOffset = 0;

5
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -583,6 +583,11 @@ VulkanCommandBuffer *VulkanFrameBuffer::GetDrawCommands()
return mDrawCommands.get(); return mDrawCommands.get();
} }
unsigned int VulkanFrameBuffer::GetLightBufferBlockSize() const
{
return mLights->GetBlockSize();
}
void VulkanFrameBuffer::PrintStartupLog() void VulkanFrameBuffer::PrintStartupLog()
{ {
FString deviceType; FString deviceType;

2
src/rendering/vulkan/system/vk_framebuffer.h
View file

@ -28,6 +28,8 @@ public:
VkRenderPassManager *GetRenderPassManager() { return mRenderPassManager.get(); } VkRenderPassManager *GetRenderPassManager() { return mRenderPassManager.get(); }
VkRenderState *GetRenderState() { return mRenderState.get(); } VkRenderState *GetRenderState() { return mRenderState.get(); }
unsigned int GetLightBufferBlockSize() const;
VKDataBuffer *ViewpointUBO = nullptr; VKDataBuffer *ViewpointUBO = nullptr;
VKDataBuffer *LightBufferSSO = nullptr; VKDataBuffer *LightBufferSSO = nullptr;
VKDataBuffer *MatricesUBO = nullptr; VKDataBuffer *MatricesUBO = nullptr;