projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7731a0)
i965: add missing return in if statement
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>
Sat, 28 May 2016 11:16:03 +0000 (13:16 +0200)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 28 May 2016 18:26:33 +0000 (11:26 -0700)
Re-add the "return false" that was removed in 0c02d7002d6c005b4c1fe997b5ef5916978dd183

It seems that something went wrong when merging the patch. The patch
sent to the mailing list does not directly match what was committed.
https://lists.freedesktop.org/archives/mesa-dev/2016-May/118198.html

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/mesa/drivers/dri/i965/intel_blit.c patch | blob | history

diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
index 5a48c20d0a94c46a59af5edf43c2b283c92ecc34..23e1ab62c4f7db47091c4256ddd3fa90c2f1af21 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -355,6 +355,7 @@ can_fast_copy_blit(struct brw_context *brw,
     */
    if (src_tr_mode == INTEL_MIPTREE_TRMODE_NONE &&
        dst_tr_mode == INTEL_MIPTREE_TRMODE_NONE)
+      return false;
 
    if (logic_op != GL_COPY)
       return false;