commit 69f2535a308d8fe380b9d380d1e1f20abb58ea39
author Chris Forbes <chrisforbes@google.com> Wed Aug 14 11:09:34 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Thu Aug 15 14:26:19 2019 +0000
tree a6f7bb6e18b4e784d20836ce83b9c36f6145efbc
parent ae0f75063c109d4619103fa8f8ea80545608dffc

Jettison android subzero support entirely

Pastel proved that the LLVM path works well for all the architectures we
care about for Android. Converted all aspects of the build to Android.bp

Bug: b/139147241
Change-Id: I8ad8c2cc816fbb313feaf4a0c4d3dcf40cff37af
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35168
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>

src/OpenGL/compiler/OutputASM.cpp

diff --git a/src/OpenGL/compiler/OutputASM.cpp b/src/OpenGL/compiler/OutputASM.cpp
index 54c6a04..8d82eca 100644
--- a/src/OpenGL/compiler/OutputASM.cpp
+++ b/src/OpenGL/compiler/OutputASM.cpp
@@ -1266,7 +1266,7 @@
 		TIntermTyped *result = node;
 		const TType &resultType = node->getType();
 		TIntermSequence &arg = node->getSequence();
-		size_t argumentCount = arg.size();
+		int argumentCount = static_cast<int>(arg.size());
 
 		switch(node->getOp())
 		{
@@ -1339,7 +1339,7 @@
 
 					TIntermSequence &arguments = *function->arg;
 
-					for(size_t i = 0; i < argumentCount; i++)
+					for(int i = 0; i < argumentCount; i++)
 					{
 						TIntermTyped *in = arguments[i]->getAsTyped();
 
@@ -1360,7 +1360,7 @@
 						copy(result, function->ret);
 					}
 
-					for(size_t i = 0; i < argumentCount; i++)
+					for(int i = 0; i < argumentCount; i++)
 					{
 						TIntermTyped *argument = arguments[i]->getAsTyped();
 						TIntermTyped *out = arg[i]->getAsTyped();
@@ -1500,7 +1500,7 @@
 				int component = 0;
 				int arrayMaxIndex = result->isArray() ? result->getArraySize() - 1 : 0;
 				int arrayComponents = result->getType().getElementSize();
-				for(size_t i = 0; i < argumentCount; i++)
+				for(int i = 0; i < argumentCount; i++)
 				{
 					TIntermTyped *argi = arg[i]->getAsTyped();
 					int size = argi->getNominalSize();
@@ -1616,7 +1616,7 @@
 					int column = 0;
 					int row = 0;
 
-					for(size_t i = 0; i < argumentCount; i++)
+					for(int i = 0; i < argumentCount; i++)
 					{
 						TIntermTyped *argi = arg[i]->getAsTyped();
 						int size = argi->getNominalSize();
@@ -1641,7 +1641,7 @@
 			if(visit == PostVisit)
 			{
 				int offset = 0;
-				for(size_t i = 0; i < argumentCount; i++)
+				for(int i = 0; i < argumentCount; i++)
 				{
 					TIntermTyped *argi = arg[i]->getAsTyped();
 					int size = argi->totalRegisterCount();