Restore r26192, r26240, r26241: All three about implicit-array sizing design…

glslang/MachineIndependent/Intermediate.cpp

@@ -866,10 +866,10 @@ void TIntermediate::addSymbolLinkageNodes(TIntermAggregate*& linkage, EShLanguag
     // by the AST.
     //
     // Almost entirely, translation of symbols is driven by what's present 
-    // in the AST traversal, not by translating the symbol table.  
+    // in the AST traversal, not by translating the symbol table.
     //
     // However, there are some special cases:
-    //  - From the specification: "Special built-in inputs gl_VertexID and 
+    //  - From the specification: "Special built-in inputs gl_VertexID and
     //    gl_InstanceID are also considered active vertex attributes."
     //  - Linker-based type mismatch error reporting needs to see all 
     //    uniforms/ins/outs variables and blocks.

glslang/MachineIndependent/ShaderLang.cpp

@@ -1064,7 +1064,7 @@ bool TProgram::linkStage(EShLanguage stage, EShMessages messages)
     intermediate[stage]->finalCheck(*infoSink);
 
     if (messages & EShMsgAST)
-        intermediate[stage]->output(*infoSink, stages[stage].size() > 1);
+        intermediate[stage]->output(*infoSink, true);
 
     return intermediate[stage]->getNumErrors() == 0;
 }

glslang/MachineIndependent/linkValidate.cpp

@@ -206,7 +206,10 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
                 // Similarly for binding
                 if (! symbol->getQualifier().hasBinding() && unitSymbol->getQualifier().hasBinding())
                     symbol->getQualifier().layoutBinding = unitSymbol->getQualifier().layoutBinding;
-                
+
+                // Update implicit array sizes
+                mergeImplicitArraySizes(symbol->getWritableType(), unitSymbol->getType());
+
                 // Check for consistent types/qualification/initializers etc.
                 mergeErrorCheck(infoSink, *symbol, *unitSymbol, false);
             }
@@ -216,6 +219,25 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
     }
 }
 
+// Recursively merge the implicit array sizes through the objects' respective type trees.
+void TIntermediate::mergeImplicitArraySizes(TType& type, const TType& unitType)
+{
+    if (type.isImplicitlySizedArray() && unitType.isArray()) {
+        int newImplicitArraySize = unitType.getArraySize();
+        if (newImplicitArraySize == 0)
+            newImplicitArraySize = unitType.getImplicitArraySize();
+        if (newImplicitArraySize > type.getImplicitArraySize ())
+            type.setImplicitArraySize(newImplicitArraySize);
+    }
+
+    // Type mismatches are caught and reported after this, just be careful for now.
+    if (! type.isStruct() || ! unitType.isStruct() || type.getStruct()->size() != unitType.getStruct()->size())
+        return;
+
+    for (int i = 0; i < (int)type.getStruct()->size(); ++i)
+        mergeImplicitArraySizes(*(*type.getStruct())[i].type, *(*unitType.getStruct())[i].type);
+}
+
 //
 // Compare two global objects from two compilation units and see if they match
 // well enough.  Rules can be different for intra- vs. cross-stage matching.
@@ -305,7 +327,7 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
 // Do final link-time error checking of a complete (merged) intermediate representation.
 // (Much error checking was done during merging).
 //
-// Also, lock in defaults of things not set.
+// Also, lock in defaults of things not set, including array sizes.
 //
 void TIntermediate::finalCheck(TInfoSink& infoSink)
 {   
@@ -392,6 +414,21 @@ void TIntermediate::finalCheck(TInfoSink& infoSink)
     case EShLangCompute:
         break;
     }
+
+    // Process the tree for any node-specific work.
+    class TFinalLinkTraverser : public TIntermTraverser {
+    public:
+        TFinalLinkTraverser() { }
+        virtual ~TFinalLinkTraverser() { }
+
+        virtual void visitSymbol(TIntermSymbol* symbol)
+        {
+            // Implicitly size arrays.
+            symbol->getWritableType().adoptImplicitArraySizes();
+        }
+    } finalLinkTraverser;
+
+    treeRoot->traverse(&finalLinkTraverser);
 }
 
 //
@@ -877,11 +914,8 @@ int TIntermediate::getBaseAlignment(const TType& type, int& size, bool std140) c
 
     // rules 5 and 7
     if (type.isMatrix()) {
-        TType derefType(type, 0);
-            
         // rule 5: deref to row, not to column, meaning the size of vector is num columns instead of num rows
-        if (type.getQualifier().layoutMatrix == ElmRowMajor)
-            derefType.setElementType(derefType.getBasicType(), type.getMatrixCols(), 0, 0, 0);
+        TType derefType(type, 0, type.getQualifier().layoutMatrix == ElmRowMajor);
             
         alignment = getBaseAlignment(derefType, size, std140);
         if (std140)

glslang/MachineIndependent/localintermediate.h

@@ -251,6 +251,7 @@ protected:
     void error(TInfoSink& infoSink, const char*);
     void mergeBodies(TInfoSink&, TIntermSequence& globals, const TIntermSequence& unitGlobals);
     void mergeLinkerObjects(TInfoSink&, TIntermSequence& linkerObjects, const TIntermSequence& unitLinkerObjects);
+    void mergeImplicitArraySizes(TType&, const TType&);
     void mergeErrorCheck(TInfoSink&, const TIntermSymbol&, const TIntermSymbol&, bool crossStage);
     void checkCallGraphCycles(TInfoSink&);
     void inOutLocationCheck(TInfoSink&);

glslang/MachineIndependent/reflection.cpp

@@ -283,7 +283,7 @@ public:
         bool block = base->getBasicType() == EbtBlock;
         if (block) {
             offset = 0;
-            anonymous = base->getName().compare(0, 6, "__anon") == 0;
+            anonymous = IsAnonymous(base->getName());
             if (base->getType().isArray()) {
                 assert(! anonymous);
                 for (int e = 0; e < base->getType().getArraySize(); ++e)