[Mesa-dev] [PATCH 3/3] intel/isl/gen9: Only use the magic 1D alignment for GEN9_2D surfaces

[Jason Ekstrand]

If the surface has a layout of GEN4_2D then we need to compute a normal 2D
alignment and not use the bogus 1D one.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Cc: Chad Versace <chad at kiwitree.net>
---
 src/intel/isl/isl_gen9.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/isl/isl_gen9.c b/src/intel/isl/isl_gen9.c
index cbbbba6..da8c749 100644
--- a/src/intel/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gen9.c
@@ -174,7 +174,7 @@ gen9_choose_image_alignment_el(const struct isl_device *dev,
       return;
    }
 
-   if (info->dim == ISL_SURF_DIM_1D) {
+   if (dim_layout == ISL_DIM_LAYOUT_GEN9_1D) {
       /* See the Skylake BSpec > Memory Views > Common Surface Formats > Surface
        * Layout and Tiling > 1D Surfaces > 1D Alignment Requirements.
        */
-- 
2.5.0.400.gff86faf