iris: Fix CCS check in iris_texture_subdata().

The intention here was to check "Would the GPU be able to compress
this if we used the PBO-based texture upload path?"  Prior to Gen12,
that meant checking for CCS_E.  On Gen12, there are a lot more types
of compression, and basic CCS_E was replaced by GEN12_CCS_E, making
this check simply not work, so we'd take the CPU path instead.

Instead, check if it has CCS, and isn't the basic "fast clear" CCS_D.

Fixes: 39f06e2848 ("iris: Implement pipe->texture_subdata directly")
Tested-by: Mark Janes <mark.a.janes@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6005>
This commit is contained in:
Kenneth Graunke
2020-07-20 17:08:46 -07:00
committed by Marge Bot
parent 0868638aed
commit 576c53dadf

View File

@@ -2095,7 +2095,8 @@ iris_texture_subdata(struct pipe_context *ctx,
* stall-avoidance blits.
*/
if (surf->tiling == ISL_TILING_LINEAR ||
res->aux.usage == ISL_AUX_USAGE_CCS_E ||
(isl_aux_usage_has_ccs(res->aux.usage) &&
res->aux.usage != ISL_AUX_USAGE_CCS_D) ||
resource_is_busy(ice, res)) {
return u_default_texture_subdata(ctx, resource, level, usage, box,
data, stride, layer_stride);