commit 536ffccd76883cc1419afa7551f6978c08492816
author Alexis Hetu <sugoi@google.com> Tue Nov 28 09:57:37 2017 -0500
committer Alexis Hétu <sugoi@google.com> Tue Nov 28 22:26:02 2017 +0000
tree 7ff135cf79ac3542f8ae6b4b2125d506ddb88155
parent ea97da4a41169217eac5d6669007811c15d315e5

Removed error from extraneous matrix packing qualifier

Two minor changes:
1) Structs are allowed to have matrix packing qualifiers
2) Adding an extra matrix packing qualifier shouldn't make
   a shader fail to compile

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

src/OpenGL/compiler/ParseHelper.cpp

diff --git a/src/OpenGL/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
index 8d58c5f..578785d 100644
--- a/src/OpenGL/compiler/ParseHelper.cpp
+++ b/src/OpenGL/compiler/ParseHelper.cpp
@@ -2387,10 +2387,9 @@
 		{
 			fieldLayoutQualifier.matrixPacking = blockLayoutQualifier.matrixPacking;
 		}
-		else if(!fieldType->isMatrix())
+		else if(!fieldType->isMatrix() && (fieldType->getBasicType() != EbtStruct))
 		{
-			error(field->line(), "invalid layout qualifier:", getMatrixPackingString(fieldLayoutQualifier.matrixPacking), "can only be used on matrix types");
-			recover();
+			warning(field->line(), "extraneous layout qualifier:", getMatrixPackingString(fieldLayoutQualifier.matrixPacking), "only has an effect on matrix types");
 		}
 
 		fieldType->setLayoutQualifier(fieldLayoutQualifier);