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

iris: handle the failure of converting unsupported yuv formats to isl

Browse Source 
Signed-off-by: James Xiong <james.xiong@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3527>
This commit is contained in:
James Xiong
2019-11-20 15:59:00 -08:00
committed by Marge Bot
parent 76f300f2e4
commit d8569baaed
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/iris/iris_formats.c
View File

@@ -40,9 +40,13 @@ iris_format_for_usage(const struct gen_device_info *devinfo,
isl_surf_usage_flags_t usage) isl_surf_usage_flags_t usage)
{ {
enum isl_format format = isl_format_for_pipe_format(pformat); enum isl_format format = isl_format_for_pipe_format(pformat);
const struct isl_format_layout *fmtl = isl_format_get_layout(format);
struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY; struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
if (format == ISL_FORMAT_UNSUPPORTED)
return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
const struct isl_format_layout *fmtl = isl_format_get_layout(format);
if (!util_format_is_srgb(pformat)) { if (!util_format_is_srgb(pformat)) {
if (util_format_is_intensity(pformat)) { if (util_format_is_intensity(pformat)) {
swizzle = ISL_SWIZZLE(RED, RED, RED, RED); swizzle = ISL_SWIZZLE(RED, RED, RED, RED);

3
src/gallium/drivers/iris/iris_resource.c
View File

@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
enum isl_format linear_format = isl_format_srgb_to_linear(rt_format); enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
if (!isl_format_supports_ccs_e(devinfo, linear_format)) if (linear_format == ISL_FORMAT_UNSUPPORTED ||
!isl_format_supports_ccs_e(devinfo, linear_format))
return false; return false;
return devinfo->gen >= 9 && devinfo->gen <= 11; return devinfo->gen >= 9 && devinfo->gen <= 11;