From f6aefa94cc83c92e0ed18aea16e63254a0ba4c30 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Tue, 17 Sep 2019 09:16:12 -0700 Subject: [PATCH] iris: Don't assume CCS_E includes CCS_D There's no longer a clear-only compression mode of CCS on Gen12+. Reviewed-by: Kenneth Graunke Reviewed-by: Sagar Ghuge Reviewed-by: Jordan Justen --- src/gallium/drivers/iris/iris_resolve.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index 30aa87d7f6e..73f2855a8b0 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -1439,8 +1439,9 @@ iris_resource_render_aux_usage(struct iris_context *ice, format_ccs_e_compat_with_resource(devinfo, res, render_format)) return ISL_AUX_USAGE_CCS_E; - /* Otherwise, we have to fall back to CCS_D */ - return ISL_AUX_USAGE_CCS_D; + /* Otherwise, we try to fall back to CCS_D */ + if (isl_format_supports_ccs_d(devinfo, render_format)) + return ISL_AUX_USAGE_CCS_D; default: return ISL_AUX_USAGE_NONE; -- 2.30.2