diff --git a/.pick_status.json b/.pick_status.json
index b51c750f8ed..76102f57931 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1244,7 +1244,7 @@
         "description": "anv: put parenthesis to the set_sampler_size equation",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "76096d04bbafddb523ffc360f6d738d16d94816b",
         "notes": null
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);