Analyze the shader for define instructions.

src/OpenGL/libGL/Device.cpp

@@ -25,8 +25,6 @@
 #include "Common/Timer.hpp"
 #include "../common/debug.h"
 
-bool localShaderConstants = false;
-
 namespace gl
 {
 	using namespace sw;

src/OpenGL/libGLES_CM/Device.cpp

@@ -25,8 +25,6 @@
 #include "Common/Timer.hpp"
 #include "../common/debug.h"
 
-bool localShaderConstants = false;
-
 namespace es1
 {
 	using namespace sw;

src/OpenGL/libGLESv2/Device.cpp

@@ -25,8 +25,6 @@
 #include "Common/Timer.hpp"
 #include "../common/debug.h"
 
-bool localShaderConstants = false;
-
 namespace es2
 {
 	using namespace sw;

src/Radiance/libRAD/Device.cpp

@@ -25,8 +25,6 @@
 #include "Common/Timer.hpp"
 #include "../common/debug.h"
 
-bool localShaderConstants = false;
-
 namespace es2
 {
 	using namespace sw;

src/Shader/PixelRoutine.cpp

@@ -20,8 +20,6 @@
 #include "Constants.hpp"
 #include "Debug.hpp"
 
-extern bool localShaderConstants;
-
 namespace sw
 {
 	extern bool complementaryDepthBuffer;
@@ -5911,7 +5909,7 @@ namespace sw
 			c.z = c.z.zzzz;
 			c.w = c.w.wwww;
 
-			if(localShaderConstants)   // Constant may be known at compile time
+			if(shader->containsDefineInstruction())   // Constant may be known at compile time
 			{
 				for(size_t j = 0; j < shader->getLength(); j++)
 				{

src/Shader/Shader.cpp

@@ -1337,6 +1337,11 @@ namespace sw
 		return containsLeave;
 	}
 
+	bool Shader::containsDefineInstruction() const
+	{
+		return containsDefine;
+	}
+
 	bool Shader::usesSampler(int index) const
 	{
 		return (usedSamplers & (1 << index)) != 0;
@@ -1545,6 +1550,7 @@ namespace sw
 		containsLeave = false;
 		containsBreak = false;
 		containsContinue = false;
+		containsDefine = false;
 
 		// Determine global presence of branching instructions
 		for(unsigned int i = 0; i < instruction.size(); i++)
@@ -1579,6 +1585,10 @@ namespace sw
 				{
 					containsContinue = true;
 				}
+			case OPCODE_DEF:
+			case OPCODE_DEFB:
+			case OPCODE_DEFI:
+				containsDefine = true;
 			}
 		}
 

src/Shader/Shader.hpp

@@ -519,6 +519,7 @@ namespace sw
 		bool containsBreakInstruction() const;
 		bool containsContinueInstruction() const;
 		bool containsLeaveInstruction() const;
+		bool containsDefineInstruction() const;
 		bool usesSampler(int i) const;
 
 		struct Semantic
@@ -593,6 +594,7 @@ namespace sw
 		bool containsBreak;
 		bool containsContinue;
 		bool containsLeave;
+		bool containsDefine;
 	};
 }
 

src/Shader/VertexProgram.cpp

@@ -18,8 +18,6 @@
 #include "SamplerCore.hpp"
 #include "Debug.hpp"
 
-extern bool localShaderConstants;
-
 namespace sw
 {
 	VertexProgram::VertexProgram(const VertexProcessor::State &state, const VertexShader *shader) : VertexRoutine(state, shader)
@@ -731,7 +729,7 @@ namespace sw
 			c.z = c.z.zzzz;
 			c.w = c.w.wwww;
 
-			if(localShaderConstants)   // Constant may be known at compile time
+			if(shader->containsDefineInstruction())   // Constant may be known at compile time
 			{
 				for(size_t j = 0; j < shader->getLength(); j++)
 				{