Fix loops with dynamic iteration count.

The 'enable' execution mask for if/else, which is also used by loops, was not being applied to predicate the instructions within a loop. Bug b/28710510 Change-Id: Ibd8e962ef60de76ec1c018ca064a791abf214c94 Reviewed-on: https://swiftshader-review.googlesource.com/15948Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Fix loops with dynamic iteration count.
6953d4a1 · Nicolas Capens · Nicolas Capens · ac6d5050 · 6953d4a1
Commit 6953d4a1 authored Jan 06, 2018 by Nicolas Capens Committed by Nicolas Capens Jan 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Shader.cpp src/Shader/Shader.cpp +3 -3

No files found.
--- a/src/Shader/Shader.cpp
+++ b/src/Shader/Shader.cpp
@@ -1684,12 +1684,12 @@ namespace sw
 		for(unsigned int i = 0; i < instruction.size(); i++)
 		{
-			// If statements
+			// If statements and loops
-			if(instruction[i]->isBranch())
+			if(instruction[i]->isBranch() || instruction[i]->isLoop())
 			{
 				branchDepth++;
 			}
-			else if(instruction[i]->opcode == OPCODE_ENDIF)
+			else if(instruction[i]->opcode == OPCODE_ENDIF || instruction[i]->isEndLoop())
 			{
 				branchDepth--;
 			}