mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxvk] Don't return a value from updateShaderResources 

We're checking the bind point all the time anyway, so the previous
design was inconsistent.
This commit is contained in:
Philip Rebohle 2019-11-28 15:25:12 +01:00
parent 2aa1ff414c
commit 4c0e4fba0c
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/dxvk/dxvk_context.cpp
View File

@ -3853,10 +3853,8 @@ namespace dxvk {
void DxvkContext::updateComputeShaderResources() {
if ((m_flags.test(DxvkContextFlag::CpDirtyResources))
|| (m_state.cp.pipeline->layout()->hasStaticBufferBindings())) {
if (this->updateShaderResources<VK_PIPELINE_BIND_POINT_COMPUTE>(m_state.cp.pipeline->layout()))
m_flags.set(DxvkContextFlag::CpDirtyPipelineState);
}
|| (m_state.cp.pipeline->layout()->hasStaticBufferBindings()))
this->updateShaderResources<VK_PIPELINE_BIND_POINT_COMPUTE>(m_state.cp.pipeline->layout());
this->updateShaderDescriptorSetBinding<VK_PIPELINE_BIND_POINT_COMPUTE>(
m_cpSet, m_state.cp.pipeline->layout());
@ -3868,10 +3866,8 @@ namespace dxvk {
void DxvkContext::updateGraphicsShaderResources() {
if ((m_flags.test(DxvkContextFlag::GpDirtyResources))
|| (m_state.gp.pipeline->layout()->hasStaticBufferBindings())) {
if (this->updateShaderResources<VK_PIPELINE_BIND_POINT_GRAPHICS>(m_state.gp.pipeline->layout()))
m_flags.set(DxvkContextFlag::GpDirtyPipelineState);
}
|| (m_state.gp.pipeline->layout()->hasStaticBufferBindings()))
this->updateShaderResources<VK_PIPELINE_BIND_POINT_GRAPHICS>(m_state.gp.pipeline->layout());
this->updateShaderDescriptorSetBinding<VK_PIPELINE_BIND_POINT_GRAPHICS>(
m_gpSet, m_state.gp.pipeline->layout());
@ -3882,7 +3878,7 @@ namespace dxvk {
template<VkPipelineBindPoint BindPoint>
bool DxvkContext::updateShaderResources(const DxvkPipelineLayout* layout) {
void DxvkContext::updateShaderResources(const DxvkPipelineLayout* layout) {
std::array<DxvkDescriptorInfo, MaxNumActiveBindings> descriptors;
// Assume that all bindings are active as a fast path
@ -4060,12 +4056,13 @@ namespace dxvk {
// If some resources are not bound, we may need to
// update spec constants and rebind the pipeline
bool updatePipelineState = refMask != bindMask;
if (updatePipelineState)
if (refMask != bindMask) {
refMask = bindMask;
return updatePipelineState;
m_flags.set(BindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS
? DxvkContextFlag::GpDirtyPipelineState
: DxvkContextFlag::CpDirtyPipelineState);
}
}

2
src/dxvk/dxvk_context.h
View File

@ -1151,7 +1151,7 @@ namespace dxvk {
void updateGraphicsShaderResources();
template<VkPipelineBindPoint BindPoint>
bool updateShaderResources(
void updateShaderResources(
const DxvkPipelineLayout* layout);
template<VkPipelineBindPoint BindPoint>