From: Jason Ekstrand Date: Wed, 24 Aug 2016 04:46:23 +0000 (-0700) Subject: intel/isl: Pass the dim_layout into choose_alignment_el X-Git-Tag: upstream/17.1.0~7035 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cda1a5dc0e1b7660d25513261358c92d7b36940c;p=platform%2Fupstream%2Fmesa.git intel/isl: Pass the dim_layout into choose_alignment_el Signed-off-by: Jason Ekstrand Reviewed-by: Topi Pohjolainen Reviewed-by: Chad Versace --- diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 05a0a9b..59429fb 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 52aa565..1d584fc 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 06cd70b..48175ca 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 de95a8f..2c52e38 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 0779c67..04414c7 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 d97d615..02273f8 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 2a95b68..5d19812 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 38a759f..b456d70 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 2017ea8..4699269 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 9c76ccf..cbbbba6 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 64ed0aa..9672ec5 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);