summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRafael Antognolli <[email protected]>2019-07-03 09:37:47 -0700
committerRafael Antognolli <[email protected]>2019-07-17 14:53:16 -0700
commit8bbd4f32bffc7cdd4ff37c05efea60ff64135edd (patch)
tree42e05dd035b5b759990ebd4cab404e5bce1da37b /src
parentdf4c2ec5e19be14f61b6ef083de47abda02f0d8c (diff)
iris: Allow resolving clear color of CCS_D surfaces.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/iris/iris_resolve.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 87c9d64561f..fb07d169f8d 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -756,9 +756,8 @@ get_ccs_d_resolve_op(enum isl_aux_state aux_state,
{
assert(aux_usage == ISL_AUX_USAGE_NONE || aux_usage == ISL_AUX_USAGE_CCS_D);
- const bool ccs_supported = aux_usage == ISL_AUX_USAGE_CCS_D;
-
- assert(ccs_supported == fast_clear_supported);
+ const bool ccs_supported =
+ (aux_usage == ISL_AUX_USAGE_CCS_D) && fast_clear_supported;
switch (aux_state) {
case ISL_AUX_STATE_CLEAR:
@@ -791,9 +790,6 @@ get_ccs_e_resolve_op(enum isl_aux_state aux_state,
aux_usage == ISL_AUX_USAGE_CCS_D ||
aux_usage == ISL_AUX_USAGE_CCS_E);
- if (aux_usage == ISL_AUX_USAGE_CCS_D)
- assert(fast_clear_supported);
-
switch (aux_state) {
case ISL_AUX_STATE_CLEAR:
case ISL_AUX_STATE_PARTIAL_CLEAR: