rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-13 16:08:50 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Only use one descriptor set for compute shaders

Browse Source 
Simplifies things a bit and avoids redundant sets in the pipeline layout.
This commit is contained in:
Philip Rebohle 2022-08-10 17:58:04 +02:00
parent 02f653fdd2
commit 9a6c378f3d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/dxvk/dxvk_pipelayout.cpp
View File

@ -9,7 +9,10 @@
namespace dxvk { namespace dxvk {
uint32_t DxvkBindingInfo::computeSetIndex() const { uint32_t DxvkBindingInfo::computeSetIndex() const {
if (stages & (VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT)) { if (stages & VK_SHADER_STAGE_COMPUTE_BIT) {
// Use one single set for compute shaders
return DxvkDescriptorSets::CsAll;
} else if (stages & VK_SHADER_STAGE_FRAGMENT_BIT) {
// For fragment shaders, create a separate set for UBOs // For fragment shaders, create a separate set for UBOs
if (descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER if (descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER
|| descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) || descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)
@ -215,12 +218,15 @@ namespace dxvk {
uint32_t DxvkBindingLayout::getSetMask() const { uint32_t DxvkBindingLayout::getSetMask() const {
uint32_t mask = 0; uint32_t mask = 0;
if (m_stages & (VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT)) { if (m_stages & VK_SHADER_STAGE_COMPUTE_BIT)
mask |= (1u << DxvkDescriptorSets::CsAll);
if (m_stages & VK_SHADER_STAGE_FRAGMENT_BIT) {
mask |= (1u << DxvkDescriptorSets::FsViews) mask |= (1u << DxvkDescriptorSets::FsViews)
| (1u << DxvkDescriptorSets::FsBuffers); | (1u << DxvkDescriptorSets::FsBuffers);
} }
if (m_stages & (VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_VERTEX_BIT)) if (m_stages & VK_SHADER_STAGE_VERTEX_BIT)
mask |= (1u << DxvkDescriptorSets::VsAll); mask |= (1u << DxvkDescriptorSets::VsAll);
return mask; return mask;
@ -292,7 +298,12 @@ namespace dxvk {
std::array<VkDescriptorSetLayout, DxvkDescriptorSets::SetCount> setLayouts = { }; std::array<VkDescriptorSetLayout, DxvkDescriptorSets::SetCount> setLayouts = { };
for (uint32_t i = 0; i < DxvkDescriptorSets::SetCount; i++) { // Use minimum number of sets for the given pipeline layout type
uint32_t setCount = m_layout.getStages() == VK_SHADER_STAGE_COMPUTE_BIT
? DxvkDescriptorSets::CsSetCount
: DxvkDescriptorSets::SetCount;
for (uint32_t i = 0; i < setCount; i++) {
m_bindingObjects[i] = setObjects[i]; m_bindingObjects[i] = setObjects[i];
// Sets can be null for partial layouts // Sets can be null for partial layouts
@ -322,7 +333,7 @@ namespace dxvk {
VkPushConstantRange pushConst = m_layout.getPushConstantRange(); VkPushConstantRange pushConst = m_layout.getPushConstantRange();
VkPipelineLayoutCreateInfo pipelineLayoutInfo = { VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO }; VkPipelineLayoutCreateInfo pipelineLayoutInfo = { VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO };
pipelineLayoutInfo.setLayoutCount = setLayouts.size(); pipelineLayoutInfo.setLayoutCount = setCount;
pipelineLayoutInfo.pSetLayouts = setLayouts.data(); pipelineLayoutInfo.pSetLayouts = setLayouts.data();
if (pushConst.stageFlags && pushConst.size) { if (pushConst.stageFlags && pushConst.size) {
@ -331,7 +342,7 @@ namespace dxvk {
} }
// If the full set is defined, create a layout without INDEPENDENT_SET_BITS // If the full set is defined, create a layout without INDEPENDENT_SET_BITS
if (m_layout.getSetMask() == (1u << DxvkDescriptorSets::SetCount) - 1) { if (m_layout.getSetMask() == (1u << setCount) - 1) {
if (vk->vkCreatePipelineLayout(vk->device(), &pipelineLayoutInfo, nullptr, &m_completeLayout)) if (vk->vkCreatePipelineLayout(vk->device(), &pipelineLayoutInfo, nullptr, &m_completeLayout))
throw DxvkError("DxvkBindingLayoutObjects: Failed to create pipeline layout"); throw DxvkError("DxvkBindingLayoutObjects: Failed to create pipeline layout");
} }

9
src/dxvk/dxvk_pipelayout.h
View File

@ -19,6 +19,9 @@ namespace dxvk {
static constexpr uint32_t FsBuffers = 1; static constexpr uint32_t FsBuffers = 1;
static constexpr uint32_t VsAll = 2; static constexpr uint32_t VsAll = 2;
static constexpr uint32_t SetCount = 3; static constexpr uint32_t SetCount = 3;
static constexpr uint32_t CsAll = 0;
static constexpr uint32_t CsSetCount = 1;
}; };
/** /**
@ -535,10 +538,8 @@ namespace dxvk {
uint32_t getDirtyComputeSets() const { uint32_t getDirtyComputeSets() const {
uint32_t result = 0; uint32_t result = 0;
if (m_dirtyBuffers & VK_SHADER_STAGE_COMPUTE_BIT) if ((m_dirtyBuffers | m_dirtyViews) & VK_SHADER_STAGE_COMPUTE_BIT)
result |= (1u << DxvkDescriptorSets::FsBuffers); result |= (1u << DxvkDescriptorSets::CsAll);
if (m_dirtyViews & VK_SHADER_STAGE_COMPUTE_BIT)
result |= (1u << DxvkDescriptorSets::FsViews) | (1u << DxvkDescriptorSets::FsBuffers);
return result; return result;
} }