Conor McCarthy : vkd3d: Remove an invalid NULL check.
Alexandre Julliard
julliard at winehq.org
Wed Mar 23 17:00:40 CDT 2022
Module: vkd3d
Branch: master
Commit: f34168481db519ff8d1578c867587cf38d1fba9e
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f34168481db519ff8d1578c867587cf38d1fba9e
Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date: Wed Mar 23 00:33:01 2022 +1000
vkd3d: Remove an invalid NULL check.
The pointer is never NULL.
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/device.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 459aa615..d1629284 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1629,16 +1629,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
features->shaderTessellationAndGeometryPointSize = VK_FALSE;
descriptor_indexing = &physical_device_info->descriptor_indexing_features;
- 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
&& (descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind
More information about the wine-cvs
mailing list