From: Eric Anholt <eric@anholt.net>
Date: Tue, 18 Jan 2011 21:12:25 +0000 (-0800)
Subject: i965: Fix a bug in i965 compute-to-MRF.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ce425f3e3e330bda859c439b915c4e59b1a2bf4;p=mesa.git

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.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index bb06fe5e36c..ba338959bf2 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3170,6 +3170,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;
 	 }