intel/isl: Pass the dim_layout into choose_alignment_el

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 05a0a9bbd8cc4a32153c9fcb263f04fcc48e536d..59429fbfe2e892fd95bc812f71dc1cc2fbcb4fa2 100644 (file)
--- 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 52aa5655bb2f78dab9cddb7628ebbad2735e4faf..1d584fc21fdfb87b38ff86811ce1924e0756d996 100644 (file)
--- 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 06cd70b9206d47074a0253bc7598fc0012069b31..48175ca3d6e9d8e15a8dc9623287809112ad3ed8 100644 (file)
--- 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 de95a8fb2808cb989d1cb1b18d8ef5a785a87335..2c52e38fdbb66dc11d142165b5ec9ccb14217708 100644 (file)
--- 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 0779c67494014a3ee328ea72cad37968b9ccb4a2..04414c7e434d957deada6301a3410df46a74909d 100644 (file)
--- 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 d97d615badd8f7ea8aef692088d5567a98241d9a..02273f83235f2f226c22345581063c82abd7d9c2 100644 (file)
--- 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 2a95b68a9bd0d901186455821338febfc782c511..5d19812092a478af74e33298249c093cc1cc938c 100644 (file)
--- 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 38a759ff08c6dcfe0def0dbd6acf036f3a1fe9bc..b456d701f09b280ca95cb829a19ee95c0af9f0a8 100644 (file)
--- 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 2017ea8ddc15359286961834d9a9ad2b2bd12696..469926949570bb9b7a03edc5dd71594341179d66 100644 (file)
--- 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 9c76ccfc669cbcb4aec1a2389c3e8b051464c44e..cbbbba66272fb31da14e338d4129b4c9ef99a54c 100644 (file)
--- 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 64ed0aa44ef34c4e6c5197689d799ccdbbd01493..9672ec53bde8e3bdd7ce307236044641955d1888 100644 (file)
--- 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);