OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isl: Use bpb in a few places where it's more natural than bs

Browse Source 
Reviewed-by: Chad Versace <chad.versace@intel.com>
This commit is contained in:
Jason Ekstrand
2016-07-08 22:10:11 -07:00
parent 8c76b9bdce
commit 01855d7331
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/isl/isl_gen6.c
View File

@@ -51,7 +51,7 @@ gen6_choose_msaa_layout(const struct isl_device *dev,
* - any compressed texture format (BC*) * - any compressed texture format (BC*)
* - any YCRCB* format * - any YCRCB* format
*/ */
if (fmtl->bs > 8) if (fmtl->bpb > 64)
return false; return false;
if (isl_format_is_compressed(info->format)) if (isl_format_is_compressed(info->format))
return false; return false;

2
src/intel/isl/isl_gen7.c
View File

@@ -51,7 +51,7 @@ gen7_choose_msaa_layout(const struct isl_device *dev,
* formats: any format with greater than 64 bits per element, any * formats: any format with greater than 64 bits per element, any
* compressed texture format (BC*), and any YCRCB* format. * compressed texture format (BC*), and any YCRCB* format.
*/ */
if (fmtl->bs > 8) if (fmtl->bpb > 64)
return false; return false;
if (isl_format_is_compressed(info->format)) if (isl_format_is_compressed(info->format))
return false; return false;

4
src/intel/isl/isl_storage_image.c
View File

@@ -194,9 +194,9 @@ isl_has_matching_typed_storage_image_format(const struct brw_device_info *devinf
if (devinfo->gen >= 9) { if (devinfo->gen >= 9) {
return true; return true;
} else if (devinfo->gen >= 8 || devinfo->is_haswell) { } 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 { } else {
return isl_format_get_layout(fmt)->bs <= 4; return isl_format_get_layout(fmt)->bpb <= 32;
} }
} }

4
src/intel/vulkan/anv_formats.c
View File

@@ -271,7 +271,7 @@ anv_get_format(const struct brw_device_info *devinfo, VkFormat vk_format,
isl_format_get_layout(format.isl_format); isl_format_get_layout(format.isl_format);
if (tiling == VK_IMAGE_TILING_OPTIMAL && if (tiling == VK_IMAGE_TILING_OPTIMAL &&
!util_is_power_of_two(isl_layout->bs)) { !util_is_power_of_two(isl_layout->bpb)) {
/* Tiled formats *must* be power-of-two because we need up upload /* Tiled formats *must* be power-of-two because we need up upload
* them with the render pipeline. For 3-channel formats, we fix * them with the render pipeline. For 3-channel formats, we fix
* this by switching them over to RGBX or RGBA formats under the * this by switching them over to RGBX or RGBA formats under the
@@ -409,7 +409,7 @@ anv_physical_device_get_format_properties(struct anv_physical_device *physical_d
* what most clients will want. * what most clients will want.
*/ */
if (linear_fmt.isl_format != ISL_FORMAT_UNSUPPORTED && if (linear_fmt.isl_format != ISL_FORMAT_UNSUPPORTED &&
!util_is_power_of_two(isl_format_layouts[linear_fmt.isl_format].bs) && !util_is_power_of_two(isl_format_layouts[linear_fmt.isl_format].bpb) &&
isl_format_rgb_to_rgbx(linear_fmt.isl_format) == ISL_FORMAT_UNSUPPORTED) { isl_format_rgb_to_rgbx(linear_fmt.isl_format) == ISL_FORMAT_UNSUPPORTED) {
tiled &= ~VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT & tiled &= ~VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT &
~VK_FORMAT_FEATURE_BLIT_DST_BIT; ~VK_FORMAT_FEATURE_BLIT_DST_BIT;

4
src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
View File

@@ -982,7 +982,7 @@ namespace brw {
/* Untyped surface reads return 32 bits of the surface per /* Untyped surface reads return 32 bits of the surface per
* component, without any sort of unpacking or type conversion, * component, without any sort of unpacking or type conversion,
*/ */
const unsigned size = isl_format_get_layout(format)->bs / 4; const unsigned size = isl_format_get_layout(format)->bpb / 32;
/* they don't properly handle out of bounds access, so we have to /* they don't properly handle out of bounds access, so we have to
* check manually if the coordinates are valid and predicate the * check manually if the coordinates are valid and predicate the
* surface read on the result, * surface read on the result,
@@ -1130,7 +1130,7 @@ namespace brw {
/* Untyped surface writes store 32 bits of the surface per /* Untyped surface writes store 32 bits of the surface per
* component, without any sort of packing or type conversion, * component, without any sort of packing or type conversion,
*/ */
const unsigned size = isl_format_get_layout(format)->bs / 4; const unsigned size = isl_format_get_layout(format)->bpb / 32;
/* they don't properly handle out of bounds access, so we have /* they don't properly handle out of bounds access, so we have
* to check manually if the coordinates are valid and predicate * to check manually if the coordinates are valid and predicate