radv: replace radv_minify() by u_minify()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28568>

7 files changed, 30 insertions, 40 deletions

diff --git a/src/amd/vulkan/meta/radv_meta_blit.c b/src/amd/vulkan/meta/radv_meta_blit.c
index 1c3b28cb962..c6f19163013 100644
--- a/src/amd/vulkan/meta/radv_meta_blit.c
+++ b/src/amd/vulkan/meta/radv_meta_blit.c
@@ -195,11 +195,11 @@ meta_emit_blit(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image,
                VkRect2D dst_box, VkSampler sampler)
 {
    struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
-   uint32_t src_width = radv_minify(src_iview->image->vk.extent.width, src_iview->vk.base_mip_level);
-   uint32_t src_height = radv_minify(src_iview->image->vk.extent.height, src_iview->vk.base_mip_level);
-   uint32_t src_depth = radv_minify(src_iview->image->vk.extent.depth, src_iview->vk.base_mip_level);
-   uint32_t dst_width = radv_minify(dst_iview->image->vk.extent.width, dst_iview->vk.base_mip_level);
-   uint32_t dst_height = radv_minify(dst_iview->image->vk.extent.height, dst_iview->vk.base_mip_level);
+   uint32_t src_width = u_minify(src_iview->image->vk.extent.width, src_iview->vk.base_mip_level);
+   uint32_t src_height = u_minify(src_iview->image->vk.extent.height, src_iview->vk.base_mip_level);
+   uint32_t src_depth = u_minify(src_iview->image->vk.extent.depth, src_iview->vk.base_mip_level);
+   uint32_t dst_width = u_minify(dst_iview->image->vk.extent.width, dst_iview->vk.base_mip_level);
+   uint32_t dst_height = u_minify(dst_iview->image->vk.extent.height, dst_iview->vk.base_mip_level);
 
    assert(src_image->vk.samples == dst_image->vk.samples);
 
diff --git a/src/amd/vulkan/meta/radv_meta_bufimage.c b/src/amd/vulkan/meta/radv_meta_bufimage.c
index 1972745ce08..b54f433d55c 100644
--- a/src/amd/vulkan/meta/radv_meta_bufimage.c
+++ b/src/amd/vulkan/meta/radv_meta_bufimage.c
@@ -1199,8 +1199,7 @@ fixup_gfx9_cs_copy(struct radv_cmd_buffer *cmd_buffer, const struct radv_meta_bl
    /* The hardware-calculated extent of the selected mip
     * (naive divide-by-two integer math)
     */
-   VkExtent2D hw_mip_extent = {radv_minify(hw_base_extent.width, mip_level),
-                               radv_minify(hw_base_extent.height, mip_level)};
+   VkExtent2D hw_mip_extent = {u_minify(hw_base_extent.width, mip_level), u_minify(hw_base_extent.height, mip_level)};
 
    /* The actual extent we want to copy */
    VkExtent2D mip_extent = {rect->width, rect->height};
diff --git a/src/amd/vulkan/meta/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c
index 670a0b1e977..0d8f9360394 100644
--- a/src/amd/vulkan/meta/radv_meta_clear.c
+++ b/src/amd/vulkan/meta/radv_meta_clear.c
@@ -1277,8 +1277,8 @@ radv_clear_dcc_comp_to_single(struct radv_cmd_buffer *cmd_buffer, struct radv_im
       if (!radv_dcc_enabled(image, range->baseMipLevel + l))
          continue;
 
-      width = radv_minify(image->vk.extent.width, range->baseMipLevel + l);
-      height = radv_minify(image->vk.extent.height, range->baseMipLevel + l);
+      width = u_minify(image->vk.extent.width, range->baseMipLevel + l);
+      height = u_minify(image->vk.extent.height, range->baseMipLevel + l);
 
       radv_image_view_init(&iview, device,
                            &(VkImageViewCreateInfo){
@@ -1950,8 +1950,8 @@ radv_clear_image_layer(struct radv_cmd_buffer *cmd_buffer, struct radv_image *im
 {
    struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
    struct radv_image_view iview;
-   uint32_t width = radv_minify(image->vk.extent.width, range->baseMipLevel + level);
-   uint32_t height = radv_minify(image->vk.extent.height, range->baseMipLevel + level);
+   uint32_t width = u_minify(image->vk.extent.width, range->baseMipLevel + level);
+   uint32_t height = u_minify(image->vk.extent.height, range->baseMipLevel + level);
 
    radv_image_view_init(&iview, device,
                         &(VkImageViewCreateInfo){
@@ -2053,8 +2053,8 @@ radv_fast_clear_range(struct radv_cmd_buffer *cmd_buffer, struct radv_image *ima
             .offset = {0, 0},
             .extent =
                {
-                  radv_minify(image->vk.extent.width, range->baseMipLevel),
-                  radv_minify(image->vk.extent.height, range->baseMipLevel),
+                  u_minify(image->vk.extent.width, range->baseMipLevel),
+                  u_minify(image->vk.extent.height, range->baseMipLevel),
                },
          },
       .baseArrayLayer = range->baseArrayLayer,
@@ -2142,7 +2142,7 @@ radv_cmd_clear_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *imag
 
       for (uint32_t l = 0; l < vk_image_subresource_level_count(&image->vk, range); ++l) {
          const uint32_t layer_count = image->vk.image_type == VK_IMAGE_TYPE_3D
-                                         ? radv_minify(image->vk.extent.depth, range->baseMipLevel + l)
+                                         ? u_minify(image->vk.extent.depth, range->baseMipLevel + l)
                                          : vk_image_subresource_layer_count(&image->vk, range);
          if (cs) {
             for (uint32_t s = 0; s < layer_count; ++s) {
diff --git a/src/amd/vulkan/meta/radv_meta_decompress.c b/src/amd/vulkan/meta/radv_meta_decompress.c
index 2d2a84f9586..553778a3b8e 100644
--- a/src/amd/vulkan/meta/radv_meta_decompress.c
+++ b/src/amd/vulkan/meta/radv_meta_decompress.c
@@ -390,8 +390,8 @@ radv_process_depth_image_layer(struct radv_cmd_buffer *cmd_buffer, struct radv_i
    struct radv_image_view iview;
    uint32_t width, height;
 
-   width = radv_minify(image->vk.extent.width, range->baseMipLevel + level);
-   height = radv_minify(image->vk.extent.height, range->baseMipLevel + level);
+   width = u_minify(image->vk.extent.width, range->baseMipLevel + level);
+   height = u_minify(image->vk.extent.height, range->baseMipLevel + level);
 
    radv_image_view_init(&iview, device,
                         &(VkImageViewCreateInfo){
@@ -479,8 +479,8 @@ radv_process_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image
       if (!radv_htile_enabled(image, subresourceRange->baseMipLevel + l))
          continue;
 
-      uint32_t width = radv_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
-      uint32_t height = radv_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
+      uint32_t width = u_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
+      uint32_t height = u_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
 
       radv_CmdSetViewport(
          cmd_buffer_h, 0, 1,
@@ -525,8 +525,8 @@ radv_expand_depth_stencil_compute(struct radv_cmd_buffer *cmd_buffer, struct rad
       if (!radv_htile_enabled(image, subresourceRange->baseMipLevel + l))
          continue;
 
-      width = radv_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
-      height = radv_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
+      width = u_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
+      height = u_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
 
       for (uint32_t s = 0; s < vk_image_subresource_layer_count(&image->vk, subresourceRange); s++) {
          radv_image_view_init(&load_iview, device,
diff --git a/src/amd/vulkan/meta/radv_meta_fast_clear.c b/src/amd/vulkan/meta/radv_meta_fast_clear.c
index 7910101f213..abc6d4d2096 100644
--- a/src/amd/vulkan/meta/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/meta/radv_meta_fast_clear.c
@@ -464,8 +464,8 @@ radv_process_color_image_layer(struct radv_cmd_buffer *cmd_buffer, struct radv_i
    struct radv_image_view iview;
    uint32_t width, height;
 
-   width = radv_minify(image->vk.extent.width, range->baseMipLevel + level);
-   height = radv_minify(image->vk.extent.height, range->baseMipLevel + level);
+   width = u_minify(image->vk.extent.width, range->baseMipLevel + level);
+   height = u_minify(image->vk.extent.height, range->baseMipLevel + level);
 
    radv_image_view_init(&iview, device,
                         &(VkImageViewCreateInfo){
@@ -589,8 +589,8 @@ radv_process_color_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *
       if (op == DCC_DECOMPRESS && !radv_dcc_enabled(image, subresourceRange->baseMipLevel + l))
          continue;
 
-      width = radv_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
-      height = radv_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
+      width = u_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
+      height = u_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
 
       radv_CmdSetViewport(
          radv_cmd_buffer_to_handle(cmd_buffer), 0, 1,
@@ -712,8 +712,8 @@ radv_decompress_dcc_compute(struct radv_cmd_buffer *cmd_buffer, struct radv_imag
       if (!radv_dcc_enabled(image, subresourceRange->baseMipLevel + l))
          continue;
 
-      width = radv_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
-      height = radv_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
+      width = u_minify(image->vk.extent.width, subresourceRange->baseMipLevel + l);
+      height = u_minify(image->vk.extent.height, subresourceRange->baseMipLevel + l);
 
       for (uint32_t s = 0; s < vk_image_subresource_layer_count(&image->vk, subresourceRange); s++) {
          radv_image_view_init(&load_iview, device,
diff --git a/src/amd/vulkan/radv_image_view.c b/src/amd/vulkan/radv_image_view.c
index c62b2ff21c8..f96cea4e922 100644
--- a/src/amd/vulkan/radv_image_view.c
+++ b/src/amd/vulkan/radv_image_view.c
@@ -776,7 +776,7 @@ radv_image_view_init(struct radv_image_view *iview, struct radv_device *device,
       break;
    case VK_IMAGE_TYPE_3D:
       assert(range->baseArrayLayer + vk_image_subresource_layer_count(&image->vk, range) - 1 <=
-             radv_minify(image->vk.extent.depth, range->baseMipLevel));
+             u_minify(image->vk.extent.depth, range->baseMipLevel));
       break;
    default:
       unreachable("bad VkImageType");
@@ -872,8 +872,8 @@ radv_image_view_init(struct radv_image_view *iview, struct radv_device *device,
             iview->extent.width = plane->surface.u.gfx9.base_mip_width;
             iview->extent.height = plane->surface.u.gfx9.base_mip_height;
          } else {
-            unsigned lvl_width = radv_minify(image->vk.extent.width, range->baseMipLevel);
-            unsigned lvl_height = radv_minify(image->vk.extent.height, range->baseMipLevel);
+            unsigned lvl_width = u_minify(image->vk.extent.width, range->baseMipLevel);
+            unsigned lvl_height = u_minify(image->vk.extent.height, range->baseMipLevel);
 
             lvl_width = DIV_ROUND_UP(lvl_width * view_bw, plane_bw);
             lvl_height = DIV_ROUND_UP(lvl_height * view_bh, plane_bh);
@@ -889,8 +889,8 @@ radv_image_view_init(struct radv_image_view *iview, struct radv_device *device,
              * extents accordingly.
              */
             if (pdev->info.gfx_level >= GFX10 &&
-                (radv_minify(iview->extent.width, range->baseMipLevel) < lvl_width ||
-                 radv_minify(iview->extent.height, range->baseMipLevel) < lvl_height) &&
+                (u_minify(iview->extent.width, range->baseMipLevel) < lvl_width ||
+                 u_minify(iview->extent.height, range->baseMipLevel) < lvl_height) &&
                 iview->vk.layer_count == 1) {
                compute_non_block_compressed_view(device, iview, &iview->nbc_view);
             }
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index bfd0505a470..51f2b00555a 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -152,15 +152,6 @@ radv_is_aligned(uintmax_t n, uintmax_t a)
    return (n & (a - 1)) == 0;
 }
 
-static inline uint32_t
-radv_minify(uint32_t n, uint32_t levels)
-{
-   if (unlikely(n == 0))
-      return 0;
-   else
-      return MAX2(n >> levels, 1);
-}
-
 static inline int
 radv_float_to_sfixed(float value, unsigned frac_bits)
 {