diff options
author | Jason Ekstrand <[email protected]> | 2016-07-08 22:10:11 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2016-07-13 11:47:37 -0700 |
commit | 01855d7331cd34633b8accc343ddf0a86a860c94 (patch) | |
tree | f2865bce7de37685500d7d7c0e638ec7432b12ad /src/intel/isl | |
parent | 8c76b9bdce4c38ab7a600706c4e0151557d75fc5 (diff) |
isl: Use bpb in a few places where it's more natural than bs
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/intel/isl')
-rw-r--r-- | src/intel/isl/isl_gen6.c | 2 | ||||
-rw-r--r-- | src/intel/isl/isl_gen7.c | 2 | ||||
-rw-r--r-- | src/intel/isl/isl_storage_image.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c index 24c393925ed..699aa41d7ba 100644 --- a/src/intel/isl/isl_gen6.c +++ b/src/intel/isl/isl_gen6.c @@ -51,7 +51,7 @@ gen6_choose_msaa_layout(const struct isl_device *dev, * - any compressed texture format (BC*) * - any YCRCB* format */ - if (fmtl->bs > 8) + if (fmtl->bpb > 64) return false; if (isl_format_is_compressed(info->format)) return false; diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c index 542c137458f..d9b0c080a4c 100644 --- a/src/intel/isl/isl_gen7.c +++ b/src/intel/isl/isl_gen7.c @@ -51,7 +51,7 @@ gen7_choose_msaa_layout(const struct isl_device *dev, * formats: any format with greater than 64 bits per element, any * compressed texture format (BC*), and any YCRCB* format. */ - if (fmtl->bs > 8) + if (fmtl->bpb > 64) return false; if (isl_format_is_compressed(info->format)) return false; diff --git a/src/intel/isl/isl_storage_image.c b/src/intel/isl/isl_storage_image.c index 590d2e48b05..2617eb0eaff 100644 --- a/src/intel/isl/isl_storage_image.c +++ b/src/intel/isl/isl_storage_image.c @@ -194,9 +194,9 @@ isl_has_matching_typed_storage_image_format(const struct brw_device_info *devinf if (devinfo->gen >= 9) { return true; } else if (devinfo->gen >= 8 || devinfo->is_haswell) { - return isl_format_get_layout(fmt)->bs <= 8; + return isl_format_get_layout(fmt)->bpb <= 64; } else { - return isl_format_get_layout(fmt)->bs <= 4; + return isl_format_get_layout(fmt)->bpb <= 32; } } |