Module: Mesa Branch: master Commit: df210ff24dbdf9d3459061196e28dd37223c0cc5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df210ff24dbdf9d3459061196e28dd37223c0cc5
Author: Thomas Hindoe Paaboel Andersen <[email protected]> Date: Sat May 28 13:16:03 2016 +0200 i965: add missing return in if statement 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 <[email protected]> --- src/mesa/drivers/dri/i965/intel_blit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index 5a48c20..23e1ab6 100644 --- 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; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
