SpirvShader: Simplify the logic around the generation of the inner loop.

The 'existsPath' condition is not required, and worse still breaks some future fixes. Bug: b/133440380 Bug: b/133481698 Change-Id: I9c5d20bf7782443b0e0e3eb0aacebae251687164 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32048 Presubmit-Ready: Ben Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

SpirvShader: Simplify the logic around the generation of the inner loop.
2a985265 · Ben Clayton · cee3dffa · 2a985265
Commit 2a985265 authored May 28, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

SpirvShader.cpp src/Pipeline/SpirvShader.cpp +3 -5

No files found.
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -2175,13 +2175,11 @@ namespace sw
 			}
 		}

-		// Emit all loop blocks, but don't emit the merge block yet.
+		// Emit all blocks between the loop header and the merge block, but
+		// don't emit the merge block yet.
 		for (auto out : block.outs)
 		{
-			if (existsPath(out, blockId, block.mergeBlock))
-			{
-				EmitBlocks(out, state, block.mergeBlock);
-			}
+			EmitBlocks(out, state, block.mergeBlock);
 		}

 		// Restore current block id after emitting loop blocks.