<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jun 14, 2017 at 12:00 PM, 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 Tue, Jun 06, 2017 at 10:00:06PM -0700, Jason Ekstrand wrote: > --- > src/mesa/drivers/dri/i965/brw_blorp.c | 106 ++++++++++++++++++++++++++++++++++ > src/mesa/drivers/dri/i965/brw_blorp.h | 4 ++ > src/mesa/drivers/dri/i965/brw_clear.c | 6 ++ > 3 files changed, 116 insertions(+) > > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c > index 38925d9..a46b624 100644 > --- a/src/mesa/drivers/dri/i965/brw_blorp.c > +++ b/src/mesa/drivers/dri/i965/brw_blorp.c > @@ -930,6 +930,112 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb, > } > > void > +brw_blorp_clear_depth_stencil(struct brw_context *brw, > + struct gl_framebuffer *fb, > + GLbitfield mask, bool partial_clear) > +{ > + const struct gl_context *ctx = &brw->ctx; > + struct gl_renderbuffer *depth_rb = > + fb->Attachment[BUFFER_DEPTH].Renderbuffer; > + struct gl_renderbuffer *stencil_rb = > + fb->Attachment[BUFFER_STENCIL].Renderbuffer; > + > + if (!depth_rb || ctx->Depth.Mask == GL_FALSE) > + mask &= ~BUFFER_BIT_DEPTH; > + > + if (!stencil_rb || (ctx->Stencil.WriteMask[0] & 0xff) == 0) > + mask &= ~BUFFER_BIT_STENCIL; > + > + if (!(mask & (BUFFER_BITS_DEPTH_STENCIL))) > + return; > + > + uint32_t x0, x1, y0, y1, rb_name, rb_height; > + if (depth_rb) { > + rb_name = depth_rb->Name; > + rb_height = depth_rb->Height; > + if (stencil_rb) { > + assert(depth_rb->Width == stencil_rb->Width); > + assert(depth_rb->Height == stencil_rb->Height); > + } > + } else { > + assert(stencil_rb); > + rb_name = stencil_rb->Name; > + rb_height = stencil_rb->Height; > + } > + > + x0 = fb->_Xmin; > + x1 = fb->_Xmax; > + if (rb_name != 0) { > + y0 = fb->_Ymin; > + y1 = fb->_Ymax; > + } else { > + y0 = rb_height - fb->_Ymax; > + y1 = rb_height - fb->_Ymin; > + } > + > + /* If the clear region is empty, just return. */ > + if (x0 == x1 || y0 == y1) > + return; > + > + unsigned level, layer, num_layers; > + struct isl_surf isl_tmp[4]; > + struct blorp_surf depth_surf, stencil_surf; > + > + if (mask & BUFFER_BIT_DEPTH) { > + struct intel_renderbuffer *irb = intel_renderbuffer(depth_rb); > + struct intel_mipmap_tree *depth_mt = > + find_miptree(GL_DEPTH_BUFFER_BIT, irb); > + > + level = irb->mt_level; > + layer = irb_logical_mt_layer(irb); > + num_layers = fb->MaxNumLayers ? irb->layer_count : 1; > + > + intel_miptree_set_all_slices_need_depth_resolve(depth_mt, level); > + > + unsigned depth_level = level; > + blorp_surf_for_miptree(brw, &depth_surf, depth_mt, true, > + (1 << ISL_AUX_USAGE_HIZ), > + &depth_level, layer, num_layers, &isl_tmp[0]); > + assert(depth_level == level); > + } > + > + uint8_t stencil_mask = 0; > + if (mask & BUFFER_BIT_STENCIL) { > + struct intel_renderbuffer *irb = intel_renderbuffer(stencil_rb); > + struct intel_mipmap_tree *stencil_mt = > + find_miptree(GL_STENCIL_BUFFER_BIT, irb); > + > + if (mask & BUFFER_BIT_DEPTH) { > + assert(level == irb->mt_level); > + assert(layer == irb_logical_mt_layer(irb)); > + assert(num_layers == fb->MaxNumLayers ? irb->layer_count : 1); > + } else { > + level = irb->mt_level; > + layer = irb_logical_mt_layer(irb); > + num_layers = fb->MaxNumLayers ? irb->layer_count : 1; > + } > + > + stencil_mask = ctx->Stencil.WriteMask[0] & 0xff; > + > + unsigned stencil_level = level; > + blorp_surf_for_miptree(brw, &stencil_surf, stencil_mt, true, > + (1 << ISL_AUX_USAGE_HIZ), </div></div>Why do we set hiz for stencil? I noticed that anv_blorp.c::anv_CmdClearDepthStencilImage() sets it to NONE for depth and stencil while get_blorp_surf_for_anv_image() has code to take the HIZ usage away for stencil (if given). </blockquote><div> </div><div>No reason. I'm happy to make it 0 for no aux support on stencil. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Otherwise looks good to me: Reviewed-by: Topi Pohjolainen <<a href="mailto:topi.pohjolainen@intel.com">topi.pohjolainen@intel.com</a>> <div><div class="h5"></div></div></blockquote><div> </div><div>Thanks! </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5"> > + &stencil_level, layer, num_layers, &isl_tmp[2]); > + } > + > + assert((mask & BUFFER_BIT_DEPTH) || stencil_mask); > + > + struct blorp_batch batch; > + blorp_batch_init(&brw->blorp, &batch, brw, 0); > + blorp_clear_depth_stencil(&batch, &depth_surf, &stencil_surf, > + level, layer, num_layers, > + x0, y0, x1, y1, > + (mask & BUFFER_BIT_DEPTH), ctx->Depth.Clear, > + stencil_mask, ctx->Stencil.Clear); > + blorp_batch_finish(&batch); > +} > + > +void > brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt, > unsigned level, unsigned layer) > { > diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h > index 8743d96..868301f 100644 > --- a/src/mesa/drivers/dri/i965/brw_blorp.h > +++ b/src/mesa/drivers/dri/i965/brw_blorp.h > @@ -62,6 +62,10 @@ brw_blorp_copy_miptrees(struct brw_context *brw, > bool > brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb, > GLbitfield mask, bool partial_clear, bool encode_srgb); > +void > +brw_blorp_clear_depth_stencil(struct brw_context *brw, > + struct gl_framebuffer *fb, > + GLbitfield mask, bool partial_clear); > > void > brw_blorp_resolve_color(struct brw_context *brw, > diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c > index 664342d..57e5f16 100644 > --- a/src/mesa/drivers/dri/i965/brw_clear.c > +++ b/src/mesa/drivers/dri/i965/brw_clear.c > @@ -293,6 +293,12 @@ brw_clear(struct gl_context *ctx, GLbitfield mask) > } > } > > + if (brw->gen >= 6 && (mask & BUFFER_BITS_DEPTH_STENCIL)) { > + brw_blorp_clear_depth_stencil(brw, fb, mask, partial_clear); > + debug_mask("blorp depth/stencil", mask & BUFFER_BITS_DEPTH_STENCIL); > + mask &= ~BUFFER_BITS_DEPTH_STENCIL; > + } > + > GLbitfield tri_mask = mask & (BUFFER_BITS_COLOR | > BUFFER_BIT_STENCIL | > BUFFER_BIT_DEPTH); > -- > 2.5.0.400.gff86faf > </div></div>> _______________________________________________ > 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>