commit e97a31e2ecef119a235e3ef474cc8d9e1395a532
author Alexis Hetu <sugoi@google.com> Mon Nov 14 14:10:47 2016 -0500
committer Alexis Hétu <sugoi@google.com> Tue Nov 15 16:34:23 2016 +0000
tree 35485b99004203d7479d4cf8e9ea67bd8be1a824
parent e1d853076fa446532b6239fb64f2ca824e8802ea

Fixed clang warnings and unmuted these warnings

A few warnings were fixed:
- 2 sets of virtual flip/blit functions were colliding, so
  I added pure virtual function overrides so that both
  definitions appear within FrameBufferWin
- Moved a few variables within ASSERT inside the ASSERT
  statement in order to remove unused variable warnings
- Removed stack option from glslang.l and removed comments
  handling code, which is actually already done by the
  preprocessor (tested in dEQP)
- Removed unused yyscanner variable from glslang.l
- Ifdefed debug only code in main.cpp

Removed all related muted warnings from BUILD.gn files.

Change-Id: Idf9e7eed00431cc747b689b5d1931fd0c1e8d506
Reviewed-on: https://swiftshader-review.googlesource.com/8010
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nico Weber <thakis@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/OutputASM.cpp

diff --git a/src/OpenGL/compiler/OutputASM.cpp b/src/OpenGL/compiler/OutputASM.cpp
index d88ce14..5495d3f 100644
--- a/src/OpenGL/compiler/OutputASM.cpp
+++ b/src/OpenGL/compiler/OutputASM.cpp
@@ -1508,8 +1508,8 @@
 			if(visit == PostVisit)
 			{
 				TIntermTyped *arg0 = arg[0]->getAsTyped();
-				TIntermTyped *arg1 = arg[1]->getAsTyped();
-				ASSERT((arg0->getNominalSize() == arg1->getNominalSize()) && (arg0->getSecondarySize() == arg1->getSecondarySize()));
+				ASSERT((arg0->getNominalSize() == arg[1]->getAsTyped()->getNominalSize()) &&
+				       (arg0->getSecondarySize() == arg[1]->getAsTyped()->getSecondarySize()));
 
 				int size = arg0->getNominalSize();
 				for(int i = 0; i < size; i++)
@@ -2169,8 +2169,7 @@
 
 				if(memberType.getBasicType() == EbtBool)
 				{
-					int arraySize = (memberType.isArray() ? memberType.getArraySize() : 1);
-					ASSERT(argumentInfo.clampedIndex < arraySize);
+					ASSERT(argumentInfo.clampedIndex < (memberType.isArray() ? memberType.getArraySize() : 1)); // index < arraySize
 
 					// Convert the packed bool, which is currently an int, to a true bool
 					Instruction *instruction = new Instruction(sw::Shader::OPCODE_I2B);
@@ -2189,9 +2188,8 @@
 				{
 					int numCols = memberType.getNominalSize();
 					int numRows = memberType.getSecondarySize();
-					int arraySize = (memberType.isArray() ? memberType.getArraySize() : 1);
 
-					ASSERT(argumentInfo.clampedIndex < (numCols * arraySize));
+					ASSERT(argumentInfo.clampedIndex < (numCols * (memberType.isArray() ? memberType.getArraySize() : 1))); // index < cols * arraySize
 
 					unsigned int dstIndex = registerIndex(&unpackedUniform);
 					unsigned int srcSwizzle = (argumentInfo.clampedIndex % numCols) * 0x55;