<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Jun 6, 2017 at 9:10 AM, Ian Romanick <<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 06/05/2017 06:03 PM, Jason Ekstrand wrote: > On Mon, Jun 5, 2017 at 5:22 PM, Ian Romanick <<a href="mailto:idr@freedesktop.org">idr@freedesktop.org</a> > <mailto:<a href="mailto:idr@freedesktop.org">idr@freedesktop.org</a>>> wrote: > > From: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a> > <mailto:<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>>> > > We call convert_to_single_slice so they may end up with a non-trivial > offset that needs to be taken into account. > > v2 (idr): Also set needs_src_offset. Suggested by Jason. > > Fixes > ES2-CTS.functional.texture.specification.basic_copyteximage2d.cube_rgba > and > ES2-CTS.functional.texture.specification.basic_copytexsubimage2d.cube_rgba > on G45. > > > Don't we also need the patch which makes us respect needs_src_offset for > the bilinear filter case? I had expected that we would, but it didn't seem to matter for this test. I was going to wait on the other patches until the whole series is ready, but I could send out the speculative fixes sooner. </blockquote><div> </div><div>I don't think the other fix is speculative. It just only happens to get triggered by generatemipmaps tests. If we had blitframebuffers tests which blit into a cube, they'd trigger it too. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a> > <mailto:<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>>> > Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=101284" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=101284</a> <div><div class="h5">> <<a href="https://bugs.freedesktop.org/show_bug.cgi?id=101284" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=101284</a>> > --- > src/intel/blorp/blorp_blit.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c > index d93cde2..e48e5da 100644 > --- a/src/intel/blorp/blorp_blit.c > +++ b/src/intel/blorp/blorp_blit.c > @@ -1672,11 +1672,15 @@ try_blorp_blit(struct blorp_batch *batch, > /* The MinLOD and MinimumArrayElement don't work properly for > cube maps. > * Convert them to a single slice on gen4. > */ > - if (params->dst.surf.usage & ISL_SURF_USAGE_CUBE_BIT) > + if (params->dst.surf.usage & ISL_SURF_USAGE_CUBE_BIT) { > blorp_surf_convert_to_single_slice(batch->blorp->isl_dev, > &params->dst); > + wm_prog_key->need_dst_offset = true; > + } > > - if (params->src.surf.usage & ISL_SURF_USAGE_CUBE_BIT) > + if (params->src.surf.usage & ISL_SURF_USAGE_CUBE_BIT) { > blorp_surf_convert_to_single_slice(batch->blorp->isl_dev, > &params->src); > + wm_prog_key->need_src_offset = true; > + } > } > > if (devinfo->gen > 6 && > -- > 2.9.4 > > _______________________________________________ > mesa-dev mailing list </div></div>> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <mailto:<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> > <<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>