commit c62fad3b19a06381ee9b82d84775698832cc4ea3
author Nicolas Capens <capn@google.com> Fri Jan 26 01:55:31 2018 +0000
committer Nicolas Capens <nicolascapens@google.com> Fri Jan 26 13:34:18 2018 +0000
tree 12533123c48663f360b04f2d1235e6818392517a
parent aa02848b8bd6436fe317bf8709ae0aec5d1fb1a8

Remove unnecessary pointer checks.

VertexProgram and PixelProgram always have a shader.

Bug chromium:805881

Change-Id: I0a27b4e7a0bc0ae591d89eb295e215bd421416fb
Reviewed-on: https://swiftshader-review.googlesource.com/16749
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Shader/PixelProgram.hpp

diff --git a/src/Shader/PixelProgram.hpp b/src/Shader/PixelProgram.hpp
index c66c863..951e147 100644
--- a/src/Shader/PixelProgram.hpp
+++ b/src/Shader/PixelProgram.hpp
@@ -24,7 +24,7 @@
 	{
 	public:
 		PixelProgram(const PixelProcessor::State &state, const PixelShader *shader) :
-			PixelRoutine(state, shader), r(shader && shader->dynamicallyIndexedTemporaries),
+			PixelRoutine(state, shader), r(shader->dynamicallyIndexedTemporaries),
 			loopDepth(-1), ifDepth(0), loopRepDepth(0), currentLabel(-1), whileTest(false)
 		{
 			for(int i = 0; i < 2048; ++i)
@@ -34,12 +34,12 @@
 
 			enableStack[0] = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 
-			if(shader && shader->containsBreakInstruction())
+			if(shader->containsBreakInstruction())
 			{
 				enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 			}
 
-			if(shader && shader->containsContinueInstruction())
+			if(shader->containsContinueInstruction())
 			{
 				enableContinue = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 			}

src/Shader/VertexProgram.cpp

diff --git a/src/Shader/VertexProgram.cpp b/src/Shader/VertexProgram.cpp
index 960772f..4f8ba1a 100644
--- a/src/Shader/VertexProgram.cpp
+++ b/src/Shader/VertexProgram.cpp
@@ -39,12 +39,12 @@
 		loopDepth = -1;
 		enableStack[0] = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 
-		if(shader && shader->containsBreakInstruction())
+		if(shader->containsBreakInstruction())
 		{
 			enableBreak = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 		}
 
-		if(shader && shader->containsContinueInstruction())
+		if(shader->containsContinueInstruction())
 		{
 			enableContinue = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
 		}