v2: Try to keep the assert as recommended by Topi. This requires modifying the num_samples check to be <= 1 because internally created buffers set num_samples = 0.
v3: Buffers are proactively marked as scanout, often, and so checking is_scanout in whether or not the buffer supports non-msrt fast clears will return false. To avoid this, only check buffers which are destined to use ccs (is a scanout buffer, and has an "mcs" buffer). Chad found this issue. v4: Use a better assertion based off of change in last patch. (Topi) v5: Remove the assert entirely Cc: Topi Pohjolainen <topi.pohjolai...@intel.com> Cc: Chad Versace <chadvers...@chromium.org> Signed-off-by: Ben Widawsky <b...@bwidawsk.net> Acked-by: Daniel Stone <dani...@collabora.com> --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index a2d555b8d3..a610d75485 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -743,8 +743,7 @@ intel_miptree_create(struct brw_context *brw, const bool lossless_compression_disabled = INTEL_DEBUG & DEBUG_NO_RBC; const bool is_lossless_compressed = unlikely(!lossless_compression_disabled) && - brw->gen >= 9 && !mt->is_scanout && - intel_miptree_supports_lossless_compressed(brw, mt); + brw->gen >= 9 && intel_miptree_supports_lossless_compressed(brw, mt); if (is_lossless_compressed) { mt->aux_disable &= ~INTEL_AUX_DISABLE_CCS; -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev