rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-19 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Merge methods to bind a compute pipeline

Browse Source 
There is no workload in practice where the same shader will be used
multiple times with different spec constants, so there is no good
reason to have two dirty flags or to split lookup and binding.
This commit is contained in:
Philip Rebohle 2022-07-17 00:09:30 +02:00
parent a1c3df7750
commit ff39819086
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/dxvk/dxvk_context.cpp
View File

@ -101,7 +101,6 @@ namespace dxvk {
DxvkContextFlag::GpDirtyDepthBias,
DxvkContextFlag::GpDirtyDepthBounds,
DxvkContextFlag::GpDirtyDepthStencilState,
DxvkContextFlag::CpDirtyPipeline,
DxvkContextFlag::CpDirtyPipelineState,
DxvkContextFlag::DirtyDrawBuffer);
@ -183,7 +182,6 @@ namespace dxvk {
if (stage == VK_SHADER_STAGE_COMPUTE_BIT) {
m_flags.set(
DxvkContextFlag::CpDirtyPipeline,
DxvkContextFlag::CpDirtyPipelineState);
} else {
m_flags.set(
@ -4395,43 +4393,38 @@ namespace dxvk {
void DxvkContext::unbindComputePipeline() {
m_flags.set(
DxvkContextFlag::CpDirtyPipeline,
DxvkContextFlag::CpDirtyPipelineState);
m_flags.set(DxvkContextFlag::CpDirtyPipelineState);
m_state.cp.pipeline = nullptr;
}
bool DxvkContext::updateComputePipeline() {
bool DxvkContext::updateComputePipelineState() {
if (unlikely(m_state.gp.pipeline != nullptr))
this->unbindGraphicsPipeline();
// Look up pipeline object based on the bound compute shader
auto newPipeline = lookupComputePipeline(m_state.cp.shaders);
m_state.cp.pipeline = newPipeline;
if (unlikely(!newPipeline))
return false;
m_descriptorState.dirtyStages(VK_SHADER_STAGE_COMPUTE_BIT);
if (m_state.cp.pipeline->getBindings()->layout().getPushConstantRange().size)
m_flags.set(DxvkContextFlag::DirtyPushConstants);
m_flags.clr(DxvkContextFlag::CpDirtyPipeline);
return true;
}
bool DxvkContext::updateComputePipelineState() {
VkPipeline pipeline = m_state.cp.pipeline->getPipelineHandle(m_state.cp.state);
// Look up Vulkan pipeline handle for the given compute state
auto pipelineHandle = newPipeline->getPipelineHandle(m_state.cp.state);
if (unlikely(!pipeline))
if (unlikely(!pipelineHandle))
return false;
m_cmd->cmdBindPipeline(
VK_PIPELINE_BIND_POINT_COMPUTE,
pipeline);
pipelineHandle);
// Mark compute resources and push constants as dirty
m_descriptorState.dirtyStages(VK_SHADER_STAGE_COMPUTE_BIT);
if (newPipeline->getBindings()->layout().getPushConstantRange().size)
m_flags.set(DxvkContextFlag::DirtyPushConstants);
m_flags.clr(DxvkContextFlag::CpDirtyPipelineState);
return true;
@ -5274,11 +5267,6 @@ namespace dxvk {
bool DxvkContext::commitComputeState() {
this->spillRenderPass(false);
if (m_flags.test(DxvkContextFlag::CpDirtyPipeline)) {
if (unlikely(!this->updateComputePipeline()))
return false;
}
if (m_flags.test(DxvkContextFlag::CpDirtyPipelineState)) {
if (unlikely(!this->updateComputePipelineState()))
return false;

1
src/dxvk/dxvk_context.h
View File

@ -1323,7 +1323,6 @@ namespace dxvk {
void pauseTransformFeedback();
void unbindComputePipeline();
bool updateComputePipeline();
bool updateComputePipelineState();
void unbindGraphicsPipeline();

3
src/dxvk/dxvk_context_state.h
View File

@ -46,8 +46,7 @@ namespace dxvk {
GpDynamicVertexStrides, ///< Vertex buffer strides are dynamic
GpIndependentSets, ///< Graphics pipeline layout was created with independent sets
CpDirtyPipeline, ///< Compute pipeline binding are out of date
CpDirtyPipelineState, ///< Compute pipeline needs to be recompiled
CpDirtyPipelineState, ///< Compute pipeline is out of date
DirtyDrawBuffer, ///< Indirect argument buffer is dirty
DirtyPushConstants, ///< Push constant data has changed