Don't continue looping when having returned from shader function.

Previously we would mask instruction execution after hitting a LEAVE, but still jump back on every loop iteration (even if infinite). This change applies the enableLeave mask to the loop test condition so we break out of the loop when all strands have hit LEAVE. Change-Id: Ia331a91fb363d20743d5b87a468c3cfcaa7b481e Reviewed-on: https://swiftshader-review.googlesource.com/5250Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Don't continue looping when having returned from shader function.
2ff2948b · Nicolas Capens · 26ea8f5e · 2ff2948b · 2ff2948b
Commit 2ff2948b authored Apr 28, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

PixelProgram.cpp src/Shader/PixelProgram.cpp +1 -0

VertexProgram.cpp src/Shader/VertexProgram.cpp +1 -0

No files found.
--- a/src/Shader/PixelProgram.cpp
+++ b/src/Shader/PixelProgram.cpp
@@ -1656,6 +1656,7 @@ namespace sw
 		const Vector4f &src = fetchRegister(temporaryRegister);
 		Int4 condition = As<Int4>(src.x);
 		condition &= enableStack[enableIndex - 1];
+		if(shader->containsLeaveInstruction()) condition &= enableLeave;
 		enableStack[enableIndex] = condition;
 		Bool notAllFalse = SignMask(condition) != 0;

--- a/src/Shader/VertexProgram.cpp
+++ b/src/Shader/VertexProgram.cpp
@@ -1438,6 +1438,7 @@ namespace sw
 		const Vector4f &src = fetchRegister(temporaryRegister);
 		Int4 condition = As<Int4>(src.x);
 		condition &= enableStack[enableIndex - 1];
+		if(shader->containsLeaveInstruction()) condition &= enableLeave;
 		enableStack[enableIndex] = condition;
 		Bool notAllFalse = SignMask(condition) != 0;