backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Remove null descriptor code paths for unbound resources

Browse Source
This commit is contained in:
Philip Rebohle 2020-07-10 16:22:42 +02:00
parent 2c641566ab
commit ce33b60f9c
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dxvk/dxvk_context.cpp
View File

@ -3866,10 +3866,6 @@ namespace dxvk {
m_cmd->trackResource<DxvkAccess::None>(res.imageView); m_cmd->trackResource<DxvkAccess::None>(res.imageView);
m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image()); m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image());
} }
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].image.sampler = VK_NULL_HANDLE;
descriptors[i].image.imageView = VK_NULL_HANDLE;
descriptors[i].image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].image = m_common->dummyResources().imageViewDescriptor(binding.view, true); descriptors[i].image = m_common->dummyResources().imageViewDescriptor(binding.view, true);
@ -3888,10 +3884,6 @@ namespace dxvk {
m_cmd->trackResource<DxvkAccess::None>(res.imageView); m_cmd->trackResource<DxvkAccess::None>(res.imageView);
m_cmd->trackResource<DxvkAccess::Write>(res.imageView->image()); m_cmd->trackResource<DxvkAccess::Write>(res.imageView->image());
} }
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].image.sampler = VK_NULL_HANDLE;
descriptors[i].image.imageView = VK_NULL_HANDLE;
descriptors[i].image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].image = m_common->dummyResources().imageViewDescriptor(binding.view, false); descriptors[i].image = m_common->dummyResources().imageViewDescriptor(binding.view, false);
@ -3912,8 +3904,6 @@ namespace dxvk {
m_cmd->trackResource<DxvkAccess::None>(res.imageView); m_cmd->trackResource<DxvkAccess::None>(res.imageView);
m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image()); m_cmd->trackResource<DxvkAccess::Read>(res.imageView->image());
} }
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].image = m_common->dummyResources().samplerDescriptor();
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].image = m_common->dummyResources().imageSamplerDescriptor(binding.view); descriptors[i].image = m_common->dummyResources().imageSamplerDescriptor(binding.view);
@ -3928,8 +3918,6 @@ namespace dxvk {
m_cmd->trackResource<DxvkAccess::None>(res.bufferView); m_cmd->trackResource<DxvkAccess::None>(res.bufferView);
m_cmd->trackResource<DxvkAccess::Read>(res.bufferView->buffer()); m_cmd->trackResource<DxvkAccess::Read>(res.bufferView->buffer());
} }
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].texelBuffer = VK_NULL_HANDLE;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].texelBuffer = m_common->dummyResources().bufferViewDescriptor(); descriptors[i].texelBuffer = m_common->dummyResources().bufferViewDescriptor();
@ -3944,8 +3932,6 @@ namespace dxvk {
m_cmd->trackResource<DxvkAccess::None>(res.bufferView); m_cmd->trackResource<DxvkAccess::None>(res.bufferView);
m_cmd->trackResource<DxvkAccess::Write>(res.bufferView->buffer()); m_cmd->trackResource<DxvkAccess::Write>(res.bufferView->buffer());
} }
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].texelBuffer = VK_NULL_HANDLE;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].texelBuffer = m_common->dummyResources().bufferViewDescriptor(); descriptors[i].texelBuffer = m_common->dummyResources().bufferViewDescriptor();
@ -3957,10 +3943,6 @@ namespace dxvk {
if (m_rcTracked.set(binding.slot)) if (m_rcTracked.set(binding.slot))
m_cmd->trackResource<DxvkAccess::Read>(res.bufferSlice.buffer()); m_cmd->trackResource<DxvkAccess::Read>(res.bufferSlice.buffer());
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].buffer.buffer = VK_NULL_HANDLE;
descriptors[i].buffer.offset = 0;
descriptors[i].buffer.range = 0;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].buffer = m_common->dummyResources().bufferDescriptor(); descriptors[i].buffer = m_common->dummyResources().bufferDescriptor();
@ -3972,10 +3954,6 @@ namespace dxvk {
if (m_rcTracked.set(binding.slot)) if (m_rcTracked.set(binding.slot))
m_cmd->trackResource<DxvkAccess::Write>(res.bufferSlice.buffer()); m_cmd->trackResource<DxvkAccess::Write>(res.bufferSlice.buffer());
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].buffer.buffer = VK_NULL_HANDLE;
descriptors[i].buffer.offset = 0;
descriptors[i].buffer.range = 0;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].buffer = m_common->dummyResources().bufferDescriptor(); descriptors[i].buffer = m_common->dummyResources().bufferDescriptor();
@ -3988,10 +3966,6 @@ namespace dxvk {
if (m_rcTracked.set(binding.slot)) if (m_rcTracked.set(binding.slot))
m_cmd->trackResource<DxvkAccess::Read>(res.bufferSlice.buffer()); m_cmd->trackResource<DxvkAccess::Read>(res.bufferSlice.buffer());
} else if (m_features.test(DxvkContextFeature::NullDescriptors)) {
descriptors[i].buffer.buffer = VK_NULL_HANDLE;
descriptors[i].buffer.offset = 0;
descriptors[i].buffer.range = 0;
} else { } else {
bindMask.clr(i); bindMask.clr(i);
descriptors[i].buffer = m_common->dummyResources().bufferDescriptor(); descriptors[i].buffer = m_common->dummyResources().bufferDescriptor();