Signed-off-by: Conor McCarthy cmccarthy@codeweavers.com --- libs/vkd3d/device.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 88221406..be6da6c0 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1471,18 +1471,15 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE;
- if (descriptor_indexing) - { - descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; - descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing = VK_FALSE; + descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; + descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing = VK_FALSE;
- /* We do not use storage buffers currently. */ - features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; - descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE; - descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE; - } + /* We do not use storage buffers currently. */ + features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; + descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE; + descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE;
- if (vulkan_info->EXT_descriptor_indexing && descriptor_indexing + if (vulkan_info->EXT_descriptor_indexing && (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind || descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind