<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Oct 26, 2017 at 9:10 AM, Pohjolainen, Topi <span dir="ltr"><<a href="mailto:topi.pohjolainen@gmail.com" target="_blank">topi.pohjolainen@gmail.com</a>></span> wrote:<br><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, Oct 25, 2017 at 02:58:40PM -0700, Jason Ekstrand wrote:<br>
> On Mon, Oct 23, 2017 at 11:07 PM, Pohjolainen, Topi <<br>
> <a href="mailto:topi.pohjolainen@gmail.com">topi.pohjolainen@gmail.com</a>> wrote:<br>
><br>
> > On Mon, Oct 23, 2017 at 05:23:08PM -0700, Jason Ekstrand wrote:<br>
> > > ---<br>
> > > src/mesa/drivers/dri/i965/brw_<wbr>blorp.c | 15 +++++++--------<br>
> > > 1 file changed, 7 insertions(+), 8 deletions(-)<br>
> > ><br>
> > > diff --git a/src/mesa/drivers/dri/i965/<wbr>brw_blorp.c<br>
> > b/src/mesa/drivers/dri/i965/<wbr>brw_blorp.c<br>
> > > index f7d128d..05204a9 100644<br>
> > > --- a/src/mesa/drivers/dri/i965/<wbr>brw_blorp.c<br>
> > > +++ b/src/mesa/drivers/dri/i965/<wbr>brw_blorp.c<br>
> > > @@ -329,6 +329,8 @@ brw_blorp_blit_miptrees(struct brw_context *brw,<br>
> > > intel_miptree_prepare_access(<wbr>brw, src_mt, src_level, 1, src_layer,<br>
> > 1,<br>
> > > src_aux_usage, src_clear_supported);<br>
> > ><br>
> > > + enum isl_format dst_isl_format =<br>
> > > + brw_blorp_to_isl_format(brw, dst_format, true);<br>
> > > enum isl_aux_usage dst_aux_usage =<br>
> > > intel_miptree_render_aux_<wbr>usage(brw, dst_mt, encode_srgb, false);<br>
> > > const bool dst_clear_supported = dst_aux_usage != ISL_AUX_USAGE_NONE;<br>
> > > @@ -352,10 +354,9 @@ brw_blorp_blit_miptrees(struct brw_context *brw,<br>
> > > struct blorp_batch batch;<br>
> > > blorp_batch_init(&brw->blorp, &batch, brw, 0);<br>
> > > blorp_blit(&batch, &src_surf, src_level, src_layer,<br>
> > > - brw_blorp_to_isl_format(brw, src_format, false),<br>
> > src_isl_swizzle,<br>
> > > + src_isl_format, src_isl_swizzle,<br>
> ><br>
> > This is functional change, isn't it? It effectively switches from<br>
> > brw_blorp_to_isl_format() to brw_isl_format_for_mesa_<wbr>format().<br>
> ><br>
><br>
> Good catch! We also need to change the declaration of src_isl_format to<br>
> use brw_blorp_to_isl_format which, while it looks like a functional change,<br>
> isn't because the only difference is for render or depth and we explicitly<br>
> disable HiZ usage. Would you rather that be a precursor patch?<br>
<br>
</div></div>Not really. If you like though you could add a word or two in the commit.<br></blockquote><div><br></div><div>Gah! That was patch 1 in the series and we both missed it. Best of both worlds, I guess. :)<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Series:<br>
<br>
Reviewed-by: Topi Pohjolainen <<a href="mailto:topi.pohjolainen@intel.com">topi.pohjolainen@intel.com</a>><br><div class="HOEnZb"><div class="h5"></div></div></blockquote><div><br></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 class="HOEnZb"><div class="h5">
><br>
><br>
> > > &dst_surf, dst_level, dst_layer,<br>
> > > - brw_blorp_to_isl_format(brw, dst_format, true),<br>
> > > - ISL_SWIZZLE_IDENTITY,<br>
> > > + dst_isl_format, ISL_SWIZZLE_IDENTITY,<br>
> > > src_x0, src_y0, src_x1, src_y1,<br>
> > > dst_x0, dst_y0, dst_x1, dst_y1,<br>
> > > filter, mirror_x, mirror_y);<br>
> > > @@ -1158,6 +1159,7 @@ do_single_blorp_clear(struct brw_context *brw,<br>
> > struct gl_framebuffer *fb,<br>
> > > mesa_format format = irb->Base.Base.Format;<br>
> > > if (!encode_srgb && _mesa_get_format_color_<wbr>encoding(format) ==<br>
> > GL_SRGB)<br>
> > > format = _mesa_get_srgb_format_linear(<wbr>format);<br>
> > > + enum isl_format isl_format = brw->mesa_to_isl_render_<wbr>format[format];<br>
> > ><br>
> > > x0 = fb->_Xmin;<br>
> > > x1 = fb->_Xmax;<br>
> > > @@ -1256,8 +1258,7 @@ do_single_blorp_clear(struct brw_context *brw,<br>
> > struct gl_framebuffer *fb,<br>
> > ><br>
> > > struct blorp_batch batch;<br>
> > > blorp_batch_init(&brw->blorp, &batch, brw, 0);<br>
> > > - blorp_fast_clear(&batch, &surf,<br>
> > > - brw->mesa_to_isl_render_<wbr>format[format],<br>
> > > + blorp_fast_clear(&batch, &surf, isl_format,<br>
> > > level, irb->mt_layer, num_layers,<br>
> > > x0, y0, x1, y1);<br>
> > > blorp_batch_finish(&batch);<br>
> > > @@ -1290,9 +1291,7 @@ do_single_blorp_clear(struct brw_context *brw,<br>
> > struct gl_framebuffer *fb,<br>
> > ><br>
> > > struct blorp_batch batch;<br>
> > > blorp_batch_init(&brw->blorp, &batch, brw, 0);<br>
> > > - blorp_clear(&batch, &surf,<br>
> > > - brw->mesa_to_isl_render_<wbr>format[format],<br>
> > > - ISL_SWIZZLE_IDENTITY,<br>
> > > + blorp_clear(&batch, &surf, isl_format, ISL_SWIZZLE_IDENTITY,<br>
> > > level, irb->mt_layer, num_layers,<br>
> > > x0, y0, x1, y1,<br>
> > > clear_color, color_write_disable);<br>
> > > --<br>
> > > 2.5.0.400.gff86faf<br>
> > ><br>
> > > ______________________________<wbr>_________________<br>
> > > mesa-dev mailing list<br>
> > > <a href="mailto:mesa-dev@lists.freedesktop.org">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/<wbr>mailman/listinfo/mesa-dev</a><br>
> ><br>
</div></div></blockquote></div><br></div></div>