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/14228Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Removed error from extraneous matrix packing qualifier
536ffccd · Alexis Hetu · Alexis Hétu · ea97da4a · 536ffccd
Commit 536ffccd authored Nov 28, 2017 by Alexis Hetu Committed by Alexis Hétu Nov 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

ParseHelper.cpp src/OpenGL/compiler/ParseHelper.cpp +2 -3

No files found.
--- a/src/OpenGL/compiler/ParseHelper.cpp
+++ b/src/OpenGL/compiler/ParseHelper.cpp
@@ -2387,10 +2387,9 @@ TIntermAggregate* TParseContext::addInterfaceBlock(const TPublicType& typeQualif
 		{
 			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");
+			warning(field->line(), "extraneous layout qualifier:", getMatrixPackingString(fieldLayoutQualifier.matrixPacking), "only has an effect on matrix types");
-			recover();
 		}
 		fieldType->setLayoutQualifier(fieldLayoutQualifier);