Mesa (7.10): i965: Fix a bug in i965 compute-to-MRF.

[Ian Romanick]

Module: Mesa
Branch: 7.10
Commit: 8b91cf406a0ffbef10e61f2a5853b5607f51e54c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b91cf406a0ffbef10e61f2a5853b5607f51e54c

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 18 13:12:25 2011 -0800

i965: Fix a bug in i965 compute-to-MRF.

Fixes piglit glsl-fs-texture2d-branching.  I couldn't come up with a
testcase that didn't involve dead code, but it's still worthwhile to
fix I think.
(cherry picked from commit 8ce425f3e3e330bda859c439b915c4e59b1a2bf4)

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f74fe03..c246709 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3133,6 +3133,7 @@ fs_visitor::compute_to_mrf()
 	  */
 	 if (scan_inst->opcode == BRW_OPCODE_DO ||
 	     scan_inst->opcode == BRW_OPCODE_WHILE ||
+	     scan_inst->opcode == BRW_OPCODE_ELSE ||
 	     scan_inst->opcode == BRW_OPCODE_ENDIF) {
 	    break;
 	 }