intel/isl: Pass the dim_layout into choose_alignment_el

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>
Reviewed-by: Chad Versace <[email protected]>

11 files changed, 24 insertions, 13 deletions

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 05a0a9bbd8c..59429fbfe2e 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -421,6 +421,7 @@ static void
 isl_choose_image_alignment_el(const struct isl_device *dev,
                               const struct isl_surf_init_info *restrict info,
                               enum isl_tiling tiling,
+                              enum isl_dim_layout dim_layout,
                               enum isl_msaa_layout msaa_layout,
                               struct isl_extent3d *image_align_el)
 {
@@ -434,20 +435,20 @@ isl_choose_image_alignment_el(const struct isl_device *dev,
    }
 
    if (ISL_DEV_GEN(dev) >= 9) {
-      gen9_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                     image_align_el);
+      gen9_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                     msaa_layout, image_align_el);
    } else if (ISL_DEV_GEN(dev) >= 8) {
-      gen8_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                     image_align_el);
+      gen8_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                     msaa_layout, image_align_el);
    } else if (ISL_DEV_GEN(dev) >= 7) {
-      gen7_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                     image_align_el);
+      gen7_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                     msaa_layout, image_align_el);
    } else if (ISL_DEV_GEN(dev) >= 6) {
-      gen6_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                     image_align_el);
+      gen6_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                     msaa_layout, image_align_el);
    } else {
-      gen4_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                     image_align_el);
+      gen4_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                     msaa_layout, image_align_el);
    }
 }
 
@@ -1146,7 +1147,7 @@ isl_surf_init_s(const struct isl_device *dev,
        return false;
 
    struct isl_extent3d image_align_el;
-   isl_choose_image_alignment_el(dev, info, tiling, msaa_layout,
+   isl_choose_image_alignment_el(dev, info, tiling, dim_layout, msaa_layout,
                                  &image_align_el);
 
    struct isl_extent3d image_align_sa =
diff --git a/src/intel/isl/isl_gen4.c b/src/intel/isl/isl_gen4.c
index 52aa5655bb2..1d584fc21fd 100644
--- a/src/intel/isl/isl_gen4.c
+++ b/src/intel/isl/isl_gen4.c
@@ -41,6 +41,7 @@ void
 gen4_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el)
 {
diff --git a/src/intel/isl/isl_gen4.h b/src/intel/isl/isl_gen4.h
index 06cd70b9206..48175ca3d6e 100644
--- a/src/intel/isl/isl_gen4.h
+++ b/src/intel/isl/isl_gen4.h
@@ -39,6 +39,7 @@ void
 gen4_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el);
 
diff --git a/src/intel/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c
index de95a8fb280..2c52e38fdbb 100644
--- a/src/intel/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gen6.c
@@ -86,6 +86,7 @@ void
 gen6_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el)
 {
diff --git a/src/intel/isl/isl_gen6.h b/src/intel/isl/isl_gen6.h
index 0779c674940..04414c7e434 100644
--- a/src/intel/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gen6.h
@@ -39,6 +39,7 @@ void
 gen6_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el);
 
diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
index d97d615badd..02273f83235 100644
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
@@ -400,6 +400,7 @@ void
 gen7_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el)
 {
diff --git a/src/intel/isl/isl_gen7.h b/src/intel/isl/isl_gen7.h
index 2a95b68a9bd..5d19812092a 100644
--- a/src/intel/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gen7.h
@@ -44,6 +44,7 @@ void
 gen7_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el);
 
diff --git a/src/intel/isl/isl_gen8.c b/src/intel/isl/isl_gen8.c
index 38a759ff08c..b456d701f09 100644
--- a/src/intel/isl/isl_gen8.c
+++ b/src/intel/isl/isl_gen8.c
@@ -196,6 +196,7 @@ void
 gen8_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el)
 {
diff --git a/src/intel/isl/isl_gen8.h b/src/intel/isl/isl_gen8.h
index 2017ea8ddc1..46992694957 100644
--- a/src/intel/isl/isl_gen8.h
+++ b/src/intel/isl/isl_gen8.h
@@ -39,6 +39,7 @@ void
 gen8_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el);
 
diff --git a/src/intel/isl/isl_gen9.c b/src/intel/isl/isl_gen9.c
index 9c76ccfc669..cbbbba66272 100644
--- a/src/intel/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gen9.c
@@ -100,6 +100,7 @@ void
 gen9_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el)
 {
@@ -195,6 +196,6 @@ gen9_choose_image_alignment_el(const struct isl_device *dev,
       return;
    }
 
-   gen8_choose_image_alignment_el(dev, info, tiling, msaa_layout,
-                                  image_align_el);
+   gen8_choose_image_alignment_el(dev, info, tiling, dim_layout,
+                                  msaa_layout, image_align_el);
 }
diff --git a/src/intel/isl/isl_gen9.h b/src/intel/isl/isl_gen9.h
index 64ed0aa44ef..9672ec53bde 100644
--- a/src/intel/isl/isl_gen9.h
+++ b/src/intel/isl/isl_gen9.h
@@ -33,6 +33,7 @@ void
 gen9_choose_image_alignment_el(const struct isl_device *dev,
                                const struct isl_surf_init_info *restrict info,
                                enum isl_tiling tiling,
+                               enum isl_dim_layout dim_layout,
                                enum isl_msaa_layout msaa_layout,
                                struct isl_extent3d *image_align_el);