From: Ben Widawsky <b...@bwidawsk.net> Upper layers of the code will have the need to specify full or partial resolves (more on this in the next patch). This code simply adds the new enums and plumbs it in as minimally as necessary.
Signed-off-by: Ben Widawsky <b...@bwidawsk.net> Acked-by: Daniel Stone <dani...@collabora.com> Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Signed-off-by: Daniel Stone <dani...@collabora.com> --- src/mesa/drivers/dri/i965/brw_blorp.c | 3 ++- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 5d642f2c5c..e9734a5f96 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -972,7 +972,8 @@ brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt, enum blorp_fast_clear_op resolve_op; if (brw->gen >= 9) { - if (surf.aux_usage == ISL_AUX_USAGE_CCS_E) + if (surf.aux_usage == ISL_AUX_USAGE_CCS_E && + hint != INTEL_RESOLVE_HINT_CLEAR_COLOR) resolve_op = BLORP_FAST_CLEAR_OP_RESOLVE_FULL; else resolve_op = BLORP_FAST_CLEAR_OP_RESOLVE_PARTIAL; diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 9e15e6e6e6..097486d44c 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -938,7 +938,9 @@ intel_miptree_used_for_rendering(const struct brw_context *brw, */ enum intel_resolve_hint { INTEL_RESOLVE_HINT_NO_HINT = 0, - INTEL_RESOLVE_HINT_IGNORE_CCS_E + INTEL_RESOLVE_HINT_IGNORE_CCS_E, + INTEL_RESOLVE_HINT_CLEAR_COLOR, + INTEL_RESOLVE_HINT_FULL, }; bool -- 2.13.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev