<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jun 14, 2017 at 4:08 PM, Nanley Chery <span dir="ltr"><<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Tue, Jun 13, 2017 at 05:50:02PM +0300, Topi Pohjolainen wrote:<br>
> Signed-off-by: Topi Pohjolainen <<a href="mailto:topi.pohjolainen@intel.com">topi.pohjolainen@intel.com</a>><br>
> ---<br>
>  src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c | 46 ++++++++++++++++++++++-----<br>
>  1 file changed, 38 insertions(+), 8 deletions(-)<br>
><br>
</span>Patches 2-4 are<br>
Reviewed-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>><br>
<div class="HOEnZb"><div class="h5"><br>
> diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> index 78a223a7f3..061860cdf6 100644<br>
> --- a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> +++ b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> @@ -2800,27 +2800,57 @@ intel_miptree_updownsample(<wbr>struct brw_context *brw,<br>
>                             struct intel_mipmap_tree *src,<br>
>                             struct intel_mipmap_tree *dst)<br>
>  {<br>
> +   unsigned src_w, src_h, dst_w, dst_h;<br>
> +<br>
> +   if (src->surf.size > 0) {<br>
> +      src_w = src->surf.logical_level0_px.<wbr>width;<br>
> +      src_h = src->surf.logical_level0_px.<wbr>height;<br>
> +   } else {<br>
> +      src_w = src->logical_width0;<br>
> +      src_h = src->logical_height0;<br>
> +   }<br>
> +<br>
> +   if (dst->surf.size > 0) {<br>
> +      dst_w = dst->surf.logical_level0_px.<wbr>width;<br>
> +      dst_h = dst->surf.logical_level0_px.<wbr>height;<br>
> +   } else {<br>
> +      dst_w = dst->logical_width0;<br>
> +      dst_h = dst->logical_height0;<br>
> +   }<br>
> +<br>
>     brw_blorp_blit_miptrees(brw,<br>
>                             src, 0 /* level */, 0 /* layer */,<br>
>                             src->format, SWIZZLE_XYZW,<br>
>                             dst, 0 /* level */, 0 /* layer */, dst->format,<br>
> -                           0, 0,<br>
> -                           src->logical_width0, src->logical_height0,<br>
> -                           0, 0,<br>
> -                           dst->logical_width0, dst->logical_height0,<br>
> +                           0, 0, src_w, src_h,<br>
> +                           0, 0, dst_w, dst_h,<br>
>                             GL_NEAREST, false, false /*mirror x, y*/,<br>
>                             false, false);<br>
><br>
>     if (src->stencil_mt) {<br>
> +      if (src->stencil_mt->surf.size > 0) {<br>
> +         src_w = src->stencil_mt->surf.logical_<wbr>level0_px.width;<br>
> +         src_h = src->stencil_mt->surf.logical_<wbr>level0_px.height;<br>
> +      } else {<br>
> +         src_w = src->stencil_mt->logical_<wbr>width0;<br>
> +         src_h = src->stencil_mt->logical_<wbr>height0;<br>
> +      }<br>
> +<br>
> +      if (dst->stencil_mt->surf.size > 0) {<br>
> +         dst_w = dst->stencil_mt->surf.logical_<wbr>level0_px.width;<br>
> +         dst_h = dst->stencil_mt->surf.logical_<wbr>level0_px.height;<br>
> +      } else {<br>
> +         dst_w = dst->stencil_mt->logical_<wbr>width0;<br>
> +         dst_h = dst->stencil_mt->logical_<wbr>height0;<br>
> +      }<br></div></div></blockquote><div><br></div><div>This would be way easier if it were just<br><br></div><div>if (src->stencil_mt)<br></div><div>   intel_miptree_updownsample(brw, src->stencil_mt, dst->stencil_mt);<br><br></div><div>Oh, well.  That can be a refactor for another day if you'd like.<br></div><div><br></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>
>        brw_blorp_blit_miptrees(brw,<br>
>                                src->stencil_mt, 0 /* level */, 0 /* layer */,<br>
>                                src->stencil_mt->format, SWIZZLE_XYZW,<br>
>                                dst->stencil_mt, 0 /* level */, 0 /* layer */,<br>
>                                dst->stencil_mt->format,<br>
> -                              0, 0,<br>
> -                              src->logical_width0, src->logical_height0,<br>
> -                              0, 0,<br>
> -                              dst->logical_width0, dst->logical_height0,<br>
> +                              0, 0, src_w, src_h,<br>
> +                              0, 0, dst_w, dst_h,<br>
>                                GL_NEAREST, false, false /*mirror x, y*/,<br>
>                                false, false /* decode/encode srgb */);<br>
>     }<br>
> --<br>
> 2.11.0<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>
______________________________<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>
</div></div></blockquote></div><br></div></div>