Mesa (master): isl: Take bpb rather than bs in tiling_get_info
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Wed Jul 13 18:48:04 UTC 2016
Module: Mesa
Branch: master
Commit: 1f0433f07575b797f6073c0b421adbc5658e1107
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f0433f07575b797f6073c0b421adbc5658e1107
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Jul 8 22:04:18 2016 -0700
isl: Take bpb rather than bs in tiling_get_info
Reviewed-by: Chad Versace <chad.versace at intel.com>
---
src/intel/isl/isl.c | 10 +++++-----
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 29b33d9..f6c9200 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 f74c071..5c697a6 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,
More information about the mesa-commit
mailing list