Fix bug from PR #678: NV_EXTENSIONS deleted implicit array sizing.
authorJohn Kessenich <cepheus@frii.com>
Fri, 27 Jan 2017 05:03:57 +0000 (22:03 -0700)
committerJohn Kessenich <cepheus@frii.com>
Fri, 27 Jan 2017 05:03:57 +0000 (22:03 -0700)
glslang/MachineIndependent/ParseHelper.cpp

index 1c12edd..f2ae8ef 100644 (file)
@@ -3431,9 +3431,9 @@ void TParseContext::redeclareBuiltinBlock(const TSourceLoc& loc, TTypeList& newT
                 oldType.getQualifier().layoutViewportRelative = newType.getQualifier().layoutViewportRelative;
                 oldType.getQualifier().layoutSecondaryViewportRelativeOffset = newType.getQualifier().layoutSecondaryViewportRelativeOffset;
             }
+#endif
             if (oldType.isImplicitlySizedArray() && newType.isExplicitlySizedArray())
                 oldType.changeOuterArraySize(newType.getOuterArraySize());
-#endif
 
             // go to next member
             ++member;