dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduces code duplication for Vulkan pipeline state binding.

Browse source
This commit is contained in:
Vladislav Belov 2024-10-07 20:16:51 +02:00
parent 8ec41f3c5d
commit 960b3180e5
No known key found for this signature in database
GPG key ID: 353545E45DB9CCB3
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
source/renderer/backend/vulkan/DeviceCommandContext.cpp
View file

@ -410,23 +410,17 @@ void CDeviceCommandContext::SetGraphicsPipelineState(
void CDeviceCommandContext::SetComputePipelineState(
IComputePipelineState* pipelineState)
{
if (m_ShaderProgram)
m_ShaderProgram->Unbind();
ENSURE(pipelineState);
CComputePipelineState* computePipelineState = pipelineState->As<CComputePipelineState>();
m_ShaderProgram = computePipelineState->GetShaderProgram()->As<CShaderProgram>();
m_ShaderProgram->Bind();
vkCmdBindPipeline(
m_CommandContext->GetCommandBuffer(), m_ShaderProgram->GetPipelineBindPoint(), computePipelineState->GetPipeline());
m_ComputePipelineState = pipelineState->As<CComputePipelineState>();
if (m_Device->GetDescriptorManager().UseDescriptorIndexing())
CShaderProgram* shaderProgram = m_ComputePipelineState->GetShaderProgram()->As<CShaderProgram>();
if (m_ShaderProgram != shaderProgram)
{
vkCmdBindDescriptorSets(
m_CommandContext->GetCommandBuffer(), m_ShaderProgram->GetPipelineBindPoint(),
m_ShaderProgram->GetPipelineLayout(), 0,
1, &m_Device->GetDescriptorManager().GetDescriptorIndexingSet(), 0, nullptr);
if (m_ShaderProgram)
m_ShaderProgram->Unbind();
m_ShaderProgram = shaderProgram;
}
m_IsPipelineStateDirty = true;
}
void CDeviceCommandContext::BlitFramebuffer(
@ -697,6 +691,7 @@ void CDeviceCommandContext::EndFramebufferPass()
if (m_ShaderProgram)
m_ShaderProgram->Unbind();
m_ShaderProgram = nullptr;
m_GraphicsPipelineState = nullptr;
if (m_DebugBarrierAfterFramebufferPass)
Utilities::SubmitDebugSyncMemoryBarrier(m_CommandContext->GetCommandBuffer());
@ -932,6 +927,8 @@ void CDeviceCommandContext::EndComputePass()
m_ShaderProgram->Unbind();
m_ShaderProgram = nullptr;
}
m_LastBoundPipeline = VK_NULL_HANDLE;
m_ComputePipelineState = nullptr;
ENSURE(m_InsideComputePass);
m_InsideComputePass = false;
@ -943,6 +940,7 @@ void CDeviceCommandContext::Dispatch(
const uint32_t groupCountZ)
{
ENSURE(m_InsideComputePass);
ApplyPipelineStateIfDirty();
m_ShaderProgram->PreDispatch(*m_CommandContext);
UpdateOutdatedConstants();
vkCmdDispatch(
@ -1172,12 +1170,16 @@ void CDeviceCommandContext::ApplyPipelineStateIfDirty()
return;
m_IsPipelineStateDirty = false;
ENSURE(m_GraphicsPipelineState);
ENSURE(m_VertexInputLayout);
ENSURE(m_Framebuffer);
ENSURE(m_GraphicsPipelineState || m_ComputePipelineState);
if (m_GraphicsPipelineState)
{
ENSURE(m_VertexInputLayout);
ENSURE(m_Framebuffer);
}
VkPipeline pipeline = m_GraphicsPipelineState->GetOrCreatePipeline(
m_VertexInputLayout, m_Framebuffer);
VkPipeline pipeline{m_GraphicsPipelineState
? m_GraphicsPipelineState->GetOrCreatePipeline(m_VertexInputLayout, m_Framebuffer)
: m_ComputePipelineState->GetPipeline()};
ENSURE(pipeline != VK_NULL_HANDLE);
if (m_LastBoundPipeline != pipeline)

2
source/renderer/backend/vulkan/DeviceCommandContext.h
View file

@ -36,6 +36,7 @@ namespace Vulkan
{
class CBuffer;
class CComputePipelineState;
class CDevice;
class CFramebuffer;
class CGraphicsPipelineState;
@ -172,6 +173,7 @@ private:
CGraphicsPipelineState* m_GraphicsPipelineState = nullptr;
CVertexInputLayout* m_VertexInputLayout = nullptr;
CFramebuffer* m_Framebuffer = nullptr;
CComputePipelineState* m_ComputePipelineState = nullptr;
CShaderProgram* m_ShaderProgram = nullptr;
bool m_IsPipelineStateDirty = true;
VkPipeline m_LastBoundPipeline = VK_NULL_HANDLE;