commit c67e57e9b16f710bb7773fdb227e688455557417
author Alexis Hetu <sugoi@google.com> Tue Jan 09 16:44:59 2018 -0500
committer Alexis Hétu <sugoi@google.com> Wed Jan 10 14:56:17 2018 +0000
tree f0e7014b2d63071bf2be9b0eb93a9864e44c1289
parent af13df45ca3aba76691a97bc7c12843cb74c488c

Build fix

Bug swiftshader:94

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

src/OpenGL/compiler/OutputASM.h

diff --git a/src/OpenGL/compiler/OutputASM.h b/src/OpenGL/compiler/OutputASM.h
index 641ec50..642508a 100644
--- a/src/OpenGL/compiler/OutputASM.h
+++ b/src/OpenGL/compiler/OutputASM.h
@@ -160,7 +160,7 @@
 	struct Varying : public ShaderVariable
 	{
 		Varying(const TType& type, const std::string &name, int reg = -1, int col = -1)
-			: ShaderVariable(type, name, reg), qualifier(type.getQualifier()), col(col)
+			: ShaderVariable(type, name, reg), qualifier(type.getQualifier()), column(col)
 		{
 		}
 
@@ -175,7 +175,7 @@
 		}
 
 		TQualifier qualifier;
-		int col;    // First register element, assigned during link
+		int column;    // First register element, assigned during link
 	};
 
 	typedef std::list<Varying> VaryingList;

src/OpenGL/libGL/Program.cpp

diff --git a/src/OpenGL/libGL/Program.cpp b/src/OpenGL/libGL/Program.cpp
index db3a860..82b0173 100644
--- a/src/OpenGL/libGL/Program.cpp
+++ b/src/OpenGL/libGL/Program.cpp
@@ -968,8 +968,8 @@
 
 					if(available)
 					{
-						varying->reg = r;
-						varying->col = 0;
+						varying->registerIndex = r;
+						varying->column = 0;
 
 						for(int y = 0; y < n; y++)
 						{
@@ -1002,8 +1002,8 @@
 
 						if(available)
 						{
-							varying->reg = r;
-							varying->col = 2;
+							varying->registerIndex = r;
+							varying->column = 2;
 
 							for(int y = 0; y < n; y++)
 							{
@@ -1046,7 +1046,7 @@
 					{
 						if(!packing[r][column])
 						{
-							varying->reg = r;
+							varying->registerIndex = r;
 
 							for(int y = r; y < r + n; y++)
 							{
@@ -1057,7 +1057,7 @@
 						}
 					}
 
-					varying->col = column;
+					varying->column = column;
 
 					success = true;
 				}
@@ -1125,8 +1125,8 @@
 			{
 				if(output->name == input->name)
 				{
-					int in = input->reg;
-					int out = output->reg;
+					int in = input->registerIndex;
+					int out = output->registerIndex;
 					int components = VariableColumnCount(output->type);
 					int registers = VariableRowCount(output->type) * output->size();
 

src/OpenGL/libGLESv2/Program.cpp

diff --git a/src/OpenGL/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp
index e427531..42cf1b3 100644
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -1494,7 +1494,7 @@
 					{
 						reg += rowCount > 1 ? colCount * subscript : subscript;
 					}
-					int col = varying.col;
+					int col = varying.column;
 					if(tfVaryingName == "gl_PointSize")
 					{
 						// Point size is stored in the y element of the vector, not the x element
@@ -1952,7 +1952,7 @@
 			return false;
 		}
 
-		for(int i = 0; i < fields1.size(); ++i)
+		for(size_t i = 0; i < fields1.size(); ++i)
 		{
 			if(fields1[i].name != fields2[i].name)
 			{