<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sat, May 28, 2016 at 4:16 AM, Thomas Hindoe Paaboel Andersen <span dir="ltr"><<a href="mailto:phomes@gmail.com" target="_blank">phomes@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Re-add the "return false" that was removed in 0c02d7002d6c005b4c1fe997b5ef5916978dd183<br>
<br>
It seems that something went wrong when merging the patch. The patch<br>
sent to the mailing list does not directly match what was committed.<br>
<a href="https://lists.freedesktop.org/archives/mesa-dev/2016-May/118198.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/archives/mesa-dev/2016-May/118198.html</a><br>
---<br>
 src/mesa/drivers/dri/i965/intel_blit.c | 1 +<br>
 1 file changed, 1 insertion(+)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c<br>
index 5a48c20..23e1ab6 100644<br>
--- a/src/mesa/drivers/dri/i965/intel_blit.c<br>
+++ b/src/mesa/drivers/dri/i965/intel_blit.c<br>
@@ -355,6 +355,7 @@ can_fast_copy_blit(struct brw_context *brw,<br>
     */<br>
    if (src_tr_mode == INTEL_MIPTREE_TRMODE_NONE &&<br>
        dst_tr_mode == INTEL_MIPTREE_TRMODE_NONE)<br>
+      return false;<br></blockquote><div><br></div><div>Wow, thanks for catching that!<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br><br></div><div>I also went ahead and pushed it.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
    if (logic_op != GL_COPY)<br>
       return false;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<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" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>