<div dir="ltr">Feel free to land<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, May 29, 2019 at 4:50 PM Nanley Chery <<a href="mailto:nanleychery@gmail.com">nanleychery@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Wed, Feb 14, 2018 at 12:19 PM Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>> wrote:<br>
><br>
> Cannonlake hardware adds a new resolve type in 3DSTATE_PS called<br>
> FAST_CLEAR_0 which does an ambiguate. Now that the hardware can do it<br>
> directly, we should use that instead of binding the CCS as a render<br>
> target and doing it manually. This was tested with a full Vulkan CTS<br>
> run on Cannonlake.<br>
> ---<br>
> src/intel/blorp/blorp_clear.c | 12 +++++++++++-<br>
> src/intel/blorp/blorp_genX_exec.h | 6 ++++++<br>
> 2 files changed, 17 insertions(+), 1 deletion(-)<br>
><br>
<br>
This patch is<br>
Reviewed-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com" target="_blank">nanley.g.chery@intel.com</a>><br>
<br>
> diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c<br>
> index 421a6c5..4ba65d0 100644<br>
> --- a/src/intel/blorp/blorp_clear.c<br>
> +++ b/src/intel/blorp/blorp_clear.c<br>
> @@ -758,7 +758,11 @@ blorp_ccs_resolve(struct blorp_batch *batch,<br>
> params.x1 = ALIGN(params.x1, x_scaledown) / x_scaledown;<br>
> params.y1 = ALIGN(params.y1, y_scaledown) / y_scaledown;<br>
><br>
> - if (batch->blorp->isl_dev->info->gen >= 9) {<br>
> + if (batch->blorp->isl_dev->info->gen >= 10) {<br>
> + assert(resolve_op == ISL_AUX_OP_FULL_RESOLVE ||<br>
> + resolve_op == ISL_AUX_OP_PARTIAL_RESOLVE ||<br>
> + resolve_op == ISL_AUX_OP_AMBIGUATE);<br>
> + } else if (batch->blorp->isl_dev->info->gen >= 9) {<br>
> assert(resolve_op == ISL_AUX_OP_FULL_RESOLVE ||<br>
> resolve_op == ISL_AUX_OP_PARTIAL_RESOLVE);<br>
> } else {<br>
> @@ -893,6 +897,12 @@ blorp_ccs_ambiguate(struct blorp_batch *batch,<br>
> struct blorp_surf *surf,<br>
> uint32_t level, uint32_t layer)<br>
> {<br>
> + if (ISL_DEV_GEN(batch->blorp->isl_dev) >= 10) {<br>
> + /* On gen10 and above, we have a hardware resolve op for this */<br>
> + return blorp_ccs_resolve(batch, surf, level, layer, 1,<br>
> + surf->surf->format, ISL_AUX_OP_AMBIGUATE);<br>
> + }<br>
> +<br>
> struct blorp_params params;<br>
> blorp_params_init(¶ms);<br>
><br>
> diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h<br>
> index 5e1312a..85abf6b 100644<br>
> --- a/src/intel/blorp/blorp_genX_exec.h<br>
> +++ b/src/intel/blorp/blorp_genX_exec.h<br>
> @@ -752,6 +752,12 @@ blorp_emit_ps_config(struct blorp_batch *batch,<br>
> switch (params->fast_clear_op) {<br>
> case ISL_AUX_OP_NONE:<br>
> break;<br>
> +#if GEN_GEN >= 10<br>
> + case ISL_AUX_OP_AMBIGUATE:<br>
> + ps.RenderTargetFastClearEnable = true;<br>
> + ps.RenderTargetResolveType = FAST_CLEAR_0;<br>
> + break;<br>
> +#endif<br>
> #if GEN_GEN >= 9<br>
> case ISL_AUX_OP_PARTIAL_RESOLVE:<br>
> ps.RenderTargetResolveType = RESOLVE_PARTIAL;<br>
> --<br>
> 2.5.0.400.gff86faf<br>
><br>
> _______________________________________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>