Module: Mesa Branch: main Commit: 2464cd81d3b74bfe1ac198777cc354010146225e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2464cd81d3b74bfe1ac198777cc354010146225e
Author: Vinson Lee <[email protected]> Date: Tue Dec 19 20:54:41 2023 -0800 nvk: Fix tautological-overlap-compare warning ../src/nouveau/vulkan/nvk_nir_lower_descriptors.c:145:55: warning: overlapping comparisons always evaluate to false [-Wtautological-overlap-compare] 145 | if (desc_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER && | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ 146 | desc_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: f1c909edd5c ("nvk/nir: Add cbuf analysis to nvi_nir_lower_descriptors()") Signed-off-by: Vinson Lee <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26772> --- src/nouveau/vulkan/nvk_nir_lower_descriptors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c index b2ebe316ded..98324ccf2e3 100644 --- a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c +++ b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c @@ -142,7 +142,7 @@ record_vulkan_resource_cbuf_use(nir_intrinsic_instr *intrin, const VkDescriptorType desc_type = nir_intrinsic_desc_type(intrin); /* These we'll handle later */ - if (desc_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER && + if (desc_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || desc_type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) return;
