Fix restoring the break execution enable mask.

Switch statements and loops should not reset the execution enable mask to all lanes at the end, because they can be nested. Instead we can just restore them to the mask value before the switch/loop. Change-Id: I4089cbf637c28f39a536de1e68e2e513ead1ec7f Reviewed-on: https://swiftshader-review.googlesource.com/15908Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Fix restoring the break execution enable mask.
d6bcc111 · Nicolas Capens · Nicolas Capens · 6953d4a1 · d6bcc111 · d6bcc111
Commit d6bcc111 authored Jan 08, 2018 by Nicolas Capens Committed by Nicolas Capens Jan 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

PixelProgram.cpp src/Shader/PixelProgram.cpp +10 -4

VertexProgram.cpp src/Shader/VertexProgram.cpp +10 -4

No files found.
--- a/src/Shader/PixelProgram.cpp
+++ b/src/Shader/PixelProgram.cpp
@@ -1507,7 +1507,6 @@ namespace sw
 		Nucleus::setInsertBlock(endBlock);

 		enableIndex--;
-		enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 		whileTest = false;
 	}

@@ -1519,8 +1518,6 @@ namespace sw

 		Nucleus::createBr(endBlock);
 		Nucleus::setInsertBlock(endBlock);
-
-		enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 	}

 	void PixelProgram::IF(const Src &src)
@@ -1699,7 +1696,7 @@ namespace sw
 		Int4 restoreBreak = enableBreak;
 		Int4 restoreContinue = enableContinue;

-		// FIXME: jump(testBlock)
+		// TODO: jump(testBlock)
 		Nucleus::createBr(testBlock);
 		Nucleus::setInsertBlock(testBlock);
 		enableContinue = restoreContinue;
@@ -1729,6 +1726,15 @@ namespace sw
 		loopRepTestBlock[loopRepDepth] = nullptr;
 		loopRepEndBlock[loopRepDepth] = endBlock;

+		Int4 restoreBreak = enableBreak;
+
+		BasicBlock *currentBlock = Nucleus::getInsertBlock();
+
+		Nucleus::setInsertBlock(endBlock);
+		enableBreak = restoreBreak;
+
+		Nucleus::setInsertBlock(currentBlock);
+
 		loopRepDepth++;
 		breakDepth = 0;
 	}

--- a/src/Shader/VertexProgram.cpp
+++ b/src/Shader/VertexProgram.cpp
@@ -1267,7 +1267,6 @@ namespace sw
 		Nucleus::setInsertBlock(endBlock);

 		enableIndex--;
-		enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 		whileTest = false;
 	}

@@ -1279,8 +1278,6 @@ namespace sw

 		Nucleus::createBr(endBlock);
 		Nucleus::setInsertBlock(endBlock);
-
-		enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 	}

 	void VertexProgram::IF(const Src &src)
@@ -1460,7 +1457,7 @@ namespace sw
 		Int4 restoreBreak = enableBreak;
 		Int4 restoreContinue = enableContinue;

-		// FIXME: jump(testBlock)
+		// TODO: jump(testBlock)
 		Nucleus::createBr(testBlock);
 		Nucleus::setInsertBlock(testBlock);
 		enableContinue = restoreContinue;
@@ -1490,6 +1487,15 @@ namespace sw
 		loopRepTestBlock[loopRepDepth] = nullptr;
 		loopRepEndBlock[loopRepDepth] = endBlock;

+		Int4 restoreBreak = enableBreak;
+
+		BasicBlock *currentBlock = Nucleus::getInsertBlock();
+
+		Nucleus::setInsertBlock(endBlock);
+		enableBreak = restoreBreak;
+
+		Nucleus::setInsertBlock(currentBlock);
+
 		loopRepDepth++;
 		breakDepth = 0;
 	}