diff options
| author | Jason Ekstrand <[email protected]> | 2016-07-08 22:04:18 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-07-13 11:47:37 -0700 |
| commit | 1f0433f07575b797f6073c0b421adbc5658e1107 (patch) | |
| tree | 1c648b4259c6c1b3e22c1a83c8a19a07a1cee9f5 | |
| parent | 01855d7331cd34633b8accc343ddf0a86a860c94 (diff) | |
isl: Take bpb rather than bs in tiling_get_info
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/intel/isl/isl.c | 10 | ||||
| -rw-r--r-- | src/intel/isl/isl.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 29b33d92b11..f6c9200674c 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -107,10 +107,10 @@ isl_device_get_sample_counts(struct isl_device *dev) bool isl_tiling_get_info(const struct isl_device *dev, enum isl_tiling tiling, - uint32_t format_block_size, + uint32_t format_bpb, struct isl_tile_info *tile_info) { - const uint32_t bs = format_block_size; + const uint32_t bs = format_bpb / 8; struct isl_extent2d logical_el, phys_B; assert(bs > 0); @@ -1063,7 +1063,7 @@ isl_surf_init_s(const struct isl_device *dev, return false; struct isl_tile_info tile_info; - if (!isl_tiling_get_info(dev, tiling, fmtl->bs, &tile_info)) + if (!isl_tiling_get_info(dev, tiling, fmtl->bpb, &tile_info)) return false; enum isl_msaa_layout msaa_layout; @@ -1180,7 +1180,7 @@ isl_surf_get_tile_info(const struct isl_device *dev, struct isl_tile_info *tile_info) { const struct isl_format_layout *fmtl = isl_format_get_layout(surf->format); - isl_tiling_get_info(dev, surf->tiling, fmtl->bs, tile_info); + isl_tiling_get_info(dev, surf->tiling, fmtl->bpb, tile_info); } void @@ -1466,7 +1466,7 @@ isl_tiling_get_intratile_offset_el(const struct isl_device *dev, } struct isl_tile_info tile_info; - isl_tiling_get_info(dev, tiling, bs, &tile_info); + isl_tiling_get_info(dev, tiling, bs * 8, &tile_info); /* Compute the offset into the tile */ *x_offset_el = total_x_offset_el % tile_info.logical_extent_el.w; diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h index f74c071705d..5c697a64d5e 100644 --- a/src/intel/isl/isl.h +++ b/src/intel/isl/isl.h @@ -1031,7 +1031,7 @@ isl_tiling_is_std_y(enum isl_tiling tiling) bool isl_tiling_get_info(const struct isl_device *dev, enum isl_tiling tiling, - uint32_t format_block_size, + uint32_t format_bpb, struct isl_tile_info *info); bool isl_surf_choose_tiling(const struct isl_device *dev, |