<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Jul 20, 2017 at 3:00 AM, Pohjolainen, Topi <<a href="mailto:topi.pohjolainen@gmail.com" target="_blank">topi.pohjolainen@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Wed, Jul 19, 2017 at 02:01:35PM -0700, Jason Ekstrand wrote: > --- > src/mesa/drivers/dri/i965/brw_blorp.c | 24 ++++++++++++++++ > src/mesa/drivers/dri/i965/brw_blorp.h | 5 ++++ > src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 40 +++++++++++++++++++++++++-- > 3 files changed, 67 insertions(+), 2 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c > index efa3b39..ac47f31 100644 > --- a/src/mesa/drivers/dri/i965/brw_blorp.c > +++ b/src/mesa/drivers/dri/i965/brw_blorp.c > @@ -1042,6 +1042,30 @@ brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt, > brw_emit_end_of_pipe_sync(brw, PIPE_CONTROL_RENDER_TARGET_FLUSH); > } > > +void > +brw_blorp_mcs_partial_resolve(struct brw_context *brw, > + struct intel_mipmap_tree *mt, > + uint32_t start_layer, uint32_t num_layers) > +{ > + DBG("%s to mt %p layers %u-%u\n", __FUNCTION__, mt, > + start_layer, start_layer + num_layers - 1); > + > + const mesa_format format = _mesa_get_srgb_format_linear(mt->format); > + enum isl_format isl_format = brw_blorp_to_isl_format(brw, format, true); > + > + struct isl_surf isl_tmp[1]; > + struct blorp_surf surf; > + uint32_t level = 0; > + blorp_surf_for_miptree(brw, &surf, mt, true, false, 0, > + &level, start_layer, num_layers, isl_tmp); > + > + struct blorp_batch batch; > + blorp_batch_init(&brw->blorp, &batch, brw, 0); > + blorp_mcs_partial_resolve(&batch, &surf, isl_format, > + start_layer, num_layers); > + blorp_batch_finish(&batch); > +} > + > /** > * Perform a HiZ or depth resolve operation. > * > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h > index 29d5788..c65a68a 100644 > --- a/src/mesa/drivers/dri/i965/brw_blorp.h > +++ b/src/mesa/drivers/dri/i965/brw_blorp.h > @@ -74,6 +74,11 @@ brw_blorp_resolve_color(struct brw_context *brw, > enum blorp_fast_clear_op resolve_op); > > void > +brw_blorp_mcs_partial_resolve(struct brw_context *brw, > + struct intel_mipmap_tree *mt, > + uint32_t start_layer, uint32_t num_layers); > + > +void > intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt, > unsigned int level, unsigned int start_layer, > unsigned int num_layers, enum blorp_hiz_op op); > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > index 2521190..1fd39a1 100644 > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > @@ -2323,6 +2323,35 @@ intel_miptree_finish_ccs_write(struct brw_context *brw, > } > > static void > +intel_miptree_prepare_mcs_access(struct brw_context *brw, > + struct intel_mipmap_tree *mt, > + uint32_t layer, > + bool mcs_supported, > + bool fast_clear_supported) > +{ > + switch (intel_miptree_get_aux_state(mt, 0, layer)) { > + case ISL_AUX_STATE_CLEAR: > + case ISL_AUX_STATE_COMPRESSED_CLEAR: > + assert(mcs_supported); > + if (!fast_clear_supported) { > + brw_blorp_mcs_partial_resolve(brw, mt, layer, 1); > + intel_miptree_set_aux_state(brw, mt, 0, layer, 1, > + ISL_AUX_STATE_COMPRESSED_NO_CLEAR); > + } > + break; > + > + case ISL_AUX_STATE_COMPRESSED_NO_CLEAR: > + assert(mcs_supported); > + break; /* Nothing to do */ > + > + case ISL_AUX_STATE_RESOLVED: > + case ISL_AUX_STATE_PASS_THROUGH: > + case ISL_AUX_STATE_AUX_INVALID: > + unreachable("Invalid aux state for MCS"); > + } > +} > + > +static void > intel_miptree_finish_mcs_write(struct brw_context *brw, > struct intel_mipmap_tree *mt, > uint32_t layer, > @@ -2336,10 +2365,10 @@ intel_miptree_finish_mcs_write(struct brw_context *brw, > break; > > case ISL_AUX_STATE_COMPRESSED_CLEAR: > + case ISL_AUX_STATE_COMPRESSED_NO_CLEAR: > assert(written_with_mcs); > break; /* Nothing to do */ > > - case ISL_AUX_STATE_COMPRESSED_NO_CLEAR: > case ISL_AUX_STATE_RESOLVED: > case ISL_AUX_STATE_PASS_THROUGH: > case ISL_AUX_STATE_AUX_INVALID: > @@ -2499,7 +2528,14 @@ intel_miptree_prepare_access(struct brw_context *brw, > > if (mt->num_samples > 1) { > /* Nothing to do for MSAA */ </div></div>We should drop this comment now, right? </blockquote><div> </div><div>Yup. Fixed locally. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > - assert(aux_supported && fast_clear_supported); > + assert(start_level == 0 && num_levels == 1); > + const uint32_t level_layers = > + miptree_layer_range_length(mt, 0, start_layer, num_layers); > + for (uint32_t a = 0; a < level_layers; a++) { > + intel_miptree_prepare_mcs_access(brw, mt, start_layer + a, > + aux_supported, > + fast_clear_supported); > + } > } else { > for (uint32_t l = 0; l < num_levels; l++) { > const uint32_t level = start_level + l; > -- > 2.5.0.400.gff86faf > > _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>