<p dir="ltr"></p>
<p dir="ltr">On Aug 11, 2016 5:34 PM, "Anuj Phogat" <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> wrote:<br>
><br>
> Thanks for the review. Can you also review the piglit patch?<br>
> "multisample_blit_scaled: Change 8X MSAA sample mapping"</p>
<p dir="ltr">Done</p>
<p dir="ltr">><br>
> On Thu, Aug 11, 2016 at 3:56 PM, Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> wrote:<br>
> > This looks good. Thanks! I think we should probably squash it in to the<br>
> > other one because there's technically a regression between the two. Both<br>
> > are<br>
> ><br>
> > Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br>
> ><br>
> > On Thu, Aug 11, 2016 at 12:28 PM, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> wrote:<br>
> >><br>
> >> This is required following the change in 8X sample positions.<br>
> >> Fixes the recently modified multisample-scaled-blit piglit tests.<br>
> >><br>
> >> Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>><br>
> >> ---<br>
> >> src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 10 +++++-----<br>
> >> src/mesa/drivers/dri/i965/gen6_multisample_state.c | 2 +-<br>
> >> 2 files changed, 6 insertions(+), 6 deletions(-)<br>
> >><br>
> >> diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
> >> b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
> >> index b903de1..f7f685b 100644<br>
> >> --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
> >> +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
> >> @@ -1094,13 +1094,13 @@ blorp_nir_manual_blend_bilinear(nir_builder *b,<br>
> >> nir_ssa_def *pos,<br>
> >> *<br>
> >> * In case of 8x MSAA the two layouts don't match.<br>
> >> * sample index layout : --------- sample number layout :<br>
> >> ---------<br>
> >> - * | 0 | 1 | | 5<br>
> >> | 2 |<br>
> >> + * | 0 | 1 | | 3<br>
> >> | 7 |<br>
> >> * ---------<br>
> >> ---------<br>
> >> - * | 2 | 3 | | 4<br>
> >> | 6 |<br>
> >> + * | 2 | 3 | | 5<br>
> >> | 0 |<br>
> >> * ---------<br>
> >> ---------<br>
> >> - * | 4 | 5 | | 0<br>
> >> | 3 |<br>
> >> + * | 4 | 5 | | 1<br>
> >> | 2 |<br>
> >> * ---------<br>
> >> ---------<br>
> >> - * | 6 | 7 | | 7<br>
> >> | 1 |<br>
> >> + * | 6 | 7 | | 4<br>
> >> | 6 |<br>
> >> * ---------<br>
> >> ---------<br>
> >> *<br>
> >> * Fortunately, this can be done fairly easily as:<br>
> >> @@ -1128,7 +1128,7 @@ blorp_nir_manual_blend_bilinear(nir_builder *b,<br>
> >> nir_ssa_def *pos,<br>
> >> sample = nir_f2i(b, sample);<br>
> >><br>
> >> if (tex_samples == 8) {<br>
> >> - sample = nir_iand(b, nir_ishr(b, nir_imm_int(b, 0x17306425),<br>
> >> + sample = nir_iand(b, nir_ishr(b, nir_imm_int(b, 0x64210573),<br>
> >> nir_ishl(b, sample, nir_imm_int(b,<br>
> >> 2))),<br>
> >> nir_imm_int(b, 0xf));<br>
> >> } else if (tex_samples == 16) {<br>
> >> diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c<br>
> >> b/src/mesa/drivers/dri/i965/gen6_multisample_state.c<br>
> >> index a47e323..a59ffec 100644<br>
> >> --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c<br>
> >> +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c<br>
> >> @@ -109,7 +109,7 @@ gen6_set_sample_maps(struct gl_context *ctx)<br>
> >> {<br>
> >> uint8_t map_2x[2] = {0, 1};<br>
> >> uint8_t map_4x[4] = {0, 1, 2, 3};<br>
> >> - uint8_t map_8x[8] = {5, 2, 4, 6, 0, 3, 7, 1};<br>
> >> + uint8_t map_8x[8] = {3, 7, 5, 0, 1, 2, 4, 6};<br>
> >> uint8_t map_16x[16] = { 15, 10, 9, 7, 4, 1, 3, 13,<br>
> >> 12, 2, 0, 6, 11, 8, 5, 14 };<br>
> >><br>
> >> --<br>
> >> 2.5.5<br>
> >><br>
> >> _______________________________________________<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">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
> ><br>
> ><br></p>