diff options
| author | Jason Ekstrand <[email protected]> | 2016-08-23 21:46:23 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-08-25 14:10:43 -0700 |
| commit | cda1a5dc0e1b7660d25513261358c92d7b36940c (patch) | |
| tree | d267601a6b563aab64738f365be6b0a332e68852 /src/intel/isl/isl.c | |
| parent | f68cfb05fa1ac9a6f5e0b921a7dce00e315fa52c (diff) | |
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]>
Diffstat (limited to 'src/intel/isl/isl.c')
| -rw-r--r-- | src/intel/isl/isl.c | 23 |
1 files changed, 12 insertions, 11 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 = |