From: Topi Pohjolainen Date: Fri, 8 Jul 2016 07:26:30 +0000 (+0300) Subject: i965: Set initial msaa fast clear status explicitly X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4c79894083459f61b78b7e6096b06086c7cefe3;p=mesa.git i965: Set initial msaa fast clear status explicitly instead of in intel_miptree_init_mcs(). For lossless compression the status is immediately overwritten in intel_miptree_alloc_non_msrt_mcs() while the status for non-compressed non-msaa miptrees is explicitly set in do_blorp_clear(). Signed-off-by: Topi Pohjolainen Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index e7f71c09730..f61b9bad124 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -1508,7 +1508,6 @@ intel_miptree_init_mcs(struct brw_context *brw, void *data = mt->mcs_buf->bo->virtual; memset(data, init_value, mt->mcs_buf->size); drm_intel_bo_unmap(mt->mcs_buf->bo); - mt->fast_clear_state = INTEL_FAST_CLEAR_STATE_CLEAR; } static struct intel_miptree_aux_buffer * @@ -1610,6 +1609,7 @@ intel_miptree_alloc_mcs(struct brw_context *brw, return false; intel_miptree_init_mcs(brw, mt, 0xFF); + mt->fast_clear_state = INTEL_FAST_CLEAR_STATE_CLEAR; return true; }