[Mesa-dev] [PATCH 2/6] isl: Rename isl_surf_init_info::min_pitch -> min_row_pitch

[Chad Versace]

It is the lower bound for isl_surf::row_pitch; not isl_surf::pitch,
which doesn't exist; nor does it affect isl_surf::array_pitch*.
---
 src/intel/blorp/blorp_blit.c | 4 ++--
 src/intel/isl/isl.c          | 6 +++---
 src/intel/isl/isl.h          | 2 +-
 src/intel/vulkan/anv_blorp.c | 2 +-
 src/intel/vulkan/anv_image.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 0cc5a840338..212d6218853 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -1419,13 +1419,13 @@ surf_convert_to_single_slice(const struct isl_device *isl_dev,
       .levels = 1,
       .array_len = 1,
       .samples = info->surf.samples,
-      .min_pitch = info->surf.row_pitch,
+      .min_row_pitch = info->surf.row_pitch,
       .usage = info->surf.usage,
       .tiling_flags = 1 << info->surf.tiling,
    };
 
    isl_surf_init_s(isl_dev, &info->surf, &init_info);
-   assert(info->surf.row_pitch == init_info.min_pitch);
+   assert(info->surf.row_pitch == init_info.min_row_pitch);
 
    /* The view is also different now. */
    info->view.base_level = 0;
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 6eb1e93efd9..189330b723d 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1005,7 +1005,7 @@ isl_calc_linear_row_pitch(const struct isl_device *dev,
 {
    const struct isl_format_layout *fmtl = isl_format_get_layout(info->format);
 
-   uint32_t row_pitch = info->min_pitch;
+   uint32_t row_pitch = info->min_row_pitch;
 
    /* First, align the surface to a cache line boundary, as the PRM explains
     * below.
@@ -1286,8 +1286,8 @@ isl_surf_init_s(const struct isl_device *dev,
                        tile_info.logical_extent_el.width);
 
       row_pitch = total_w_tl * tile_info.phys_extent_B.width;
-      if (row_pitch < info->min_pitch) {
-         row_pitch = isl_align_npot(info->min_pitch,
+      if (row_pitch < info->min_row_pitch) {
+         row_pitch = isl_align_npot(info->min_row_pitch,
                                     tile_info.phys_extent_B.width);
       }
 
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index add708b760f..e517f11cf5e 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -811,7 +811,7 @@ struct isl_surf_init_info {
    uint32_t min_alignment;
 
    /** Lower bound for isl_surf::row_pitch, in bytes. */
-   uint32_t min_pitch;
+   uint32_t min_row_pitch;
 
    isl_surf_usage_flags_t usage;
 
diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index d79c5e0e8c6..215afe7d4df 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -159,7 +159,7 @@ get_blorp_surf_for_anv_buffer(struct anv_device *device,
                  .levels = 1,
                  .array_len = 1,
                  .samples = 1,
-                 .min_pitch = row_pitch,
+                 .min_row_pitch = row_pitch,
                  .usage = ISL_SURF_USAGE_TEXTURE_BIT |
                           ISL_SURF_USAGE_RENDER_TARGET_BIT,
                  .tiling_flags = ISL_TILING_LINEAR_BIT);
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 59f730c7c60..4aa8b965b13 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -166,7 +166,7 @@ make_surface(const struct anv_device *dev,
       .array_len = vk_info->arrayLayers,
       .samples = vk_info->samples,
       .min_alignment = 0,
-      .min_pitch = anv_info->stride,
+      .min_row_pitch = anv_info->stride,
       .usage = choose_isl_surf_usage(image->usage, aspect),
       .tiling_flags = tiling_flags);
 
-- 
2.12.0