commit d4ae863d01d5f448dbbba6be4ecc161971a2324f
author John Bauman <jbauman@google.com> Tue May 06 16:18:33 2014 -0400
committer Nicolas Capens <capn@google.com> Tue May 06 16:18:33 2014 -0400
tree 78d545425ab40611774463a27d0fddb95d1c491d
parent 450c32d041f88129aa97633e5f147e59931e6499

Update to June 11 2013 code drop.

This should fix the hang bug we've been seeing.

src/Shader/PixelRoutine.cpp

diff --git a/src/Shader/PixelRoutine.cpp b/src/Shader/PixelRoutine.cpp
index def4354..1dd429e 100644
--- a/src/Shader/PixelRoutine.cpp
+++ b/src/Shader/PixelRoutine.cpp
@@ -5813,20 +5813,23 @@
 	Int4 PixelRoutine::enableMask(Registers &r, const Shader::Instruction *instruction)
 	{
 		Int4 enable = instruction->analysisBranch ? Int4(r.enableStack[r.enableIndex]) : Int4(0xFFFFFFFF);
-					
-		if(shader->containsBreakInstruction() && !whileTest && instruction->analysisBreak)
+		
+		if(!whileTest)
 		{
-			enable &= r.enableBreak;
-		}
+			if(shader->containsBreakInstruction() && instruction->analysisBreak)
+			{
+				enable &= r.enableBreak;
+			}
 
-		if(shader->containsContinueInstruction() && !whileTest && instruction->analysisContinue)
-		{
-			enable &= r.enableContinue;
-		}
+			if(shader->containsContinueInstruction() && instruction->analysisContinue)
+			{
+				enable &= r.enableContinue;
+			}
 
-		if(shader->containsLeaveInstruction() && instruction->analysisLeave)
-		{
-			enable &= r.enableLeave;
+			if(shader->containsLeaveInstruction() && instruction->analysisLeave)
+			{
+				enable &= r.enableLeave;
+			}
 		}
 
 		return enable;