commit 53ad4afcee973b4323f84eb54c26d8329c66e51c
author Alexis Hetu <sugoi@google.com> Wed Dec 06 14:49:07 2017 -0500
committer Alexis Hétu <sugoi@google.com> Thu Dec 07 15:11:13 2017 +0000
tree 74952501d777e3eb7cac6d30d67c16ee69b14ee7
parent 10c74a62ed7bcde6e4f48445bd43e2f8707c30d6

Rename version to shaderModel

In order to avoid creating confusion between shader model and
the actual shader's version, as specified by the #version
token in a glsl shader, version was renamed to shaderModel.

Change-Id: I481b6e3fc43168b504c2f2d9506422a697abc3a2
Reviewed-on: https://swiftshader-review.googlesource.com/14629
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Shader/VertexShader.cpp

diff --git a/src/Shader/VertexShader.cpp b/src/Shader/VertexShader.cpp
index ebdfc97..33c2241 100644
--- a/src/Shader/VertexShader.cpp
+++ b/src/Shader/VertexShader.cpp
@@ -23,7 +23,7 @@
 {
 	VertexShader::VertexShader(const VertexShader *vs) : Shader()
 	{
-		version = 0x0300;
+		shaderModel = 0x0300;
 		positionRegister = Pos;
 		pointSizeRegister = Unused;
 		instanceIdDeclared = false;
@@ -226,7 +226,7 @@
 
 	void VertexShader::analyzeOutput()
 	{
-		if(version < 0x0300)
+		if(shaderModel < 0x0300)
 		{
 			output[Pos][0] = Semantic(Shader::USAGE_POSITION, 0);
 			output[Pos][1] = Semantic(Shader::USAGE_POSITION, 0);