From ed9f1359368be185f632e2a5b1f6edf16ef89b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 23 Apr 2025 13:59:05 +0300 Subject: [PATCH] anv: put parenthesis to the set_sampler_size equation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes errors seen with some renderdoc captures failing to allocate descriptor sets. Fixes: 76096d04bba ("anv: relax restriction on variable count descriptors") Signed-off-by: Tapani Pälli Reviewed-by: Rohan Garg Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_descriptor_set.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index d6f589ea51e..5ce1f6e0eee 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -979,18 +979,18 @@ anv_descriptor_set_layout_descriptor_buffer_size(const struct anv_descriptor_set /* Inline uniform blocks are specified to use the descriptor array * size as the size in bytes of the block. */ - set_surface_size = set_layout->descriptor_buffer_surface_size - - dynamic_binding->array_size + var_desc_count; + set_surface_size = (set_layout->descriptor_buffer_surface_size - + dynamic_binding->array_size) + var_desc_count; set_sampler_size = 0; } else { set_surface_size = - set_layout->descriptor_buffer_surface_size - - dynamic_binding->array_size * dynamic_binding->descriptor_surface_stride + - var_desc_count * dynamic_binding->descriptor_surface_stride; + (set_layout->descriptor_buffer_surface_size - + dynamic_binding->array_size * dynamic_binding->descriptor_surface_stride) + + var_desc_count * dynamic_binding->descriptor_surface_stride; set_sampler_size = - set_layout->descriptor_buffer_sampler_size - - dynamic_binding->array_size * dynamic_binding->descriptor_sampler_stride - - var_desc_count * dynamic_binding->descriptor_sampler_stride; + (set_layout->descriptor_buffer_sampler_size - + dynamic_binding->array_size * dynamic_binding->descriptor_sampler_stride) + + var_desc_count * dynamic_binding->descriptor_sampler_stride; } *out_surface_size = ALIGN(set_surface_size, ANV_UBO_ALIGNMENT);