Fix printing of 'unknown stage' during crossStageCheck

Test/baseResults/iomap.crossStage.2.vert.out

@@ -207,8 +207,8 @@ Linked geometry stage:
 
 Linked fragment stage:
 
-WARNING: Linking unknown stage and fragment stages: Matched shader interfaces are using different instance names.
-    unknown stage stage: Block: crossStageBlock2 Instance: blockName1: ""
+WARNING: Linking fragment stage: Matched shader interfaces are using different instance names.
+    vertex stage: Block: crossStageBlock2 Instance: blockName1: ""
     fragment stage: Block: crossStageBlock2 Instance: blockName2: ""
 
 Shader version: 460

Test/baseResults/iomap.crossStage.vert.out

@@ -133,8 +133,8 @@ Linked vertex stage:
 
 Linked fragment stage:
 
-WARNING: Linking unknown stage and fragment stages: Matched shader interfaces are using different instance names.
-    unknown stage stage: Block: crossStageBlock2 Instance: blockName1: ""
+WARNING: Linking fragment stage: Matched shader interfaces are using different instance names.
+    vertex stage: Block: crossStageBlock2 Instance: blockName1: ""
     fragment stage: Block: crossStageBlock2 Instance: blockName2: ""
 
 Shader version: 460

Test/baseResults/iomap.crossStage.vk.vert.out

@@ -194,8 +194,8 @@ Linked geometry stage:
 
 Linked fragment stage:
 
-WARNING: Linking unknown stage and fragment stages: Matched shader interfaces are using different instance names.
-    unknown stage stage: Block: crossStageBlock2 Instance: blockName1: ""
+WARNING: Linking fragment stage: Matched shader interfaces are using different instance names.
+    vertex stage: Block: crossStageBlock2 Instance: blockName1: ""
     fragment stage: Block: crossStageBlock2 Instance: blockName2: ""
 
 Shader version: 460

Test/baseResults/iomap.mismatchedBufferTypes.vert.out

@@ -0,0 +1,45 @@
+iomap.mismatchedBufferTypes.vert
+Shader version: 460
+0:? Sequence
+0:10  Function Definition: main( ( global void)
+0:10    Function Parameters: 
+0:?   Linker Objects
+0:?     'blockname' (layout( column_major std140) uniform block{layout( column_major std140) uniform float a, layout( column_major std140) uniform float b})
+0:?     'gl_VertexID' ( gl_VertexId int VertexId)
+0:?     'gl_InstanceID' ( gl_InstanceId int InstanceId)
+
+iomap.mismatchedBufferTypes.frag
+Shader version: 460
+0:? Sequence
+0:10  Function Definition: main( ( global void)
+0:10    Function Parameters: 
+0:?   Linker Objects
+0:?     'blockname' (layout( column_major std140) uniform block{layout( column_major std140) uniform float a})
+
+
+Linked vertex stage:
+
+
+Linked fragment stage:
+
+ERROR: Linking fragment stage: vertex block member has no corresponding member in fragment block:
+    vertex stage: Block: crossStageBlock, Member: b
+    fragment stage: Block: crossStageBlock, Member: n/a 
+
+Shader version: 460
+0:? Sequence
+0:10  Function Definition: main( ( global void)
+0:10    Function Parameters: 
+0:?   Linker Objects
+0:?     'blockname' (layout( column_major std140) uniform block{layout( column_major std140) uniform float a, layout( column_major std140) uniform float b})
+0:?     'gl_VertexID' ( gl_VertexId int VertexId)
+0:?     'gl_InstanceID' ( gl_InstanceId int InstanceId)
+Shader version: 460
+0:? Sequence
+0:10  Function Definition: main( ( global void)
+0:10    Function Parameters: 
+0:?   Linker Objects
+0:?     'blockname' (layout( column_major std140) uniform block{layout( column_major std140) uniform float a})
+
+Validation failed
+SPIR-V is not generated for failed compile or link

Test/baseResults/validation_fails.txt

@@ -39,6 +39,7 @@ Test/baseResults/hlsl.struct.split.assign.frag.out
 Test/baseResults/hlsl.texture.struct.frag.out
 Test/baseResults/hlsl.tristream-append.geom.out
 Test/baseResults/iomap.crossStage.vk.2.vert.out
+Test/baseResults/iomap.mismatchedBufferTypes.vert.out
 Test/baseResults/link.vk.differentPC.0.0.frag.out
 Test/baseResults/link.vk.differentPC.1.0.frag.out
 Test/baseResults/link.vk.pcNamingInvalid.0.0.vert.out

Test/baseResults/vk.relaxed.errorcheck.vert.out

@@ -72,8 +72,8 @@ Linked vertex stage:
 
 Linked fragment stage:
 
-ERROR: Linking unknown stage stage: Types must match:
-    a: " uniform highp 2-component vector of float" versus " uniform highp 4-component vector of float"
+ERROR: Linking fragment stage: Types must match:
+    a: " uniform highp 2-component vector of float" in stage vertex versus " uniform highp 4-component vector of float" in stage fragment
 
 Shader version: 460
 0:? Sequence

Test/iomap.mismatchedBufferTypes.frag

@@ -0,0 +1,10 @@
+#version 460
+
+// GLSL spec: Hence, the types, initializers, and any location specifiers of all statically used uniform
+// variables with the same name must match across all shaders that are linked into a single program
+uniform crossStageBlock {
+    float a;
+    // 2nd member from vert absent in frag
+} blockname;
+
+void main() {}

Test/iomap.mismatchedBufferTypes.vert

@@ -0,0 +1,10 @@
+#version 460
+
+// GLSL spec: Hence, the types, initializers, and any location specifiers of all statically used uniform
+// variables with the same name must match across all shaders that are linked into a single program
+uniform crossStageBlock {
+    float a;
+    float b; // not present in frag
+} blockname;
+
+void main() {}

glslang/HLSL/hlslParseHelper.cpp

@@ -1396,7 +1396,7 @@ TIntermTyped* HlslParseContext::flattenAccess(long long uniqueId, int member, TS
 
         // If this is not the final flattening, accumulate the position and return
         // an object of the partially dereferenced type.
-        subsetSymbol = new TIntermSymbol(uniqueId, "flattenShadow", dereferencedType);
+        subsetSymbol = new TIntermSymbol(uniqueId, "flattenShadow", getLanguage(), dereferencedType);
         subsetSymbol->setFlattenSubset(newSubset);
     }
 
@@ -5806,6 +5806,7 @@ void HlslParseContext::addInputArgumentConversions(const TFunction& function, TI
                     internalAggregate->getWritableType().getQualifier().makeTemporary();
                     TIntermSymbol* internalSymbolNode = new TIntermSymbol(internalAggregate->getUniqueId(),
                                                                           internalAggregate->getName(),
+                                                                          getLanguage(),
                                                                           internalAggregate->getType());
                     internalSymbolNode->setLoc(arg->getLoc());
                     // This makes the deepest level, the member-wise copy

glslang/Include/intermediate.h

@@ -1356,8 +1356,8 @@ class TIntermSymbol : public TIntermTyped {
     // if symbol is initialized as symbol(sym), the memory comes from the pool allocator of sym. If sym comes from
     // per process threadPoolAllocator, then it causes increased memory usage per compile
     // it is essential to use "symbol = sym" to assign to symbol
-    TIntermSymbol(long long i, const TString& n, const TType& t)
-        : TIntermTyped(t), id(i), flattenSubset(-1), constSubtree(nullptr) { name = n; }
+    TIntermSymbol(long long i, const TString& n, EShLanguage s, const TType& t)
+        : TIntermTyped(t), id(i), flattenSubset(-1), stage(s), constSubtree(nullptr) { name = n; }
     virtual long long getId() const { return id; }
     virtual void changeId(long long i) { id = i; }
     virtual const TString& getName() const { return name; }
@@ -1376,11 +1376,13 @@ class TIntermSymbol : public TIntermTyped {
     // This is meant for cases where a node has already been constructed, and
     // later on, it becomes necessary to switch to a different symbol.
     virtual void switchId(long long newId) { id = newId; }
+    EShLanguage getStage() const { return stage; }
 
 protected:
     long long id;                // the unique id of the symbol this node represents
     int flattenSubset;           // how deeply the flattened object rooted at id has been dereferenced
     TString name;                // the name of the symbol this node represents
+    EShLanguage stage;
     TConstUnionArray constArray; // if the symbol is a front-end compile-time constant, this is its value
     TIntermTyped* constSubtree;
 };

glslang/MachineIndependent/Intermediate.cpp

@@ -68,7 +68,7 @@ namespace glslang {
 TIntermSymbol* TIntermediate::addSymbol(long long id, const TString& name, const TType& type, const TConstUnionArray& constArray,
                                         TIntermTyped* constSubtree, const TSourceLoc& loc)
 {
-    TIntermSymbol* node = new TIntermSymbol(id, name, type);
+    TIntermSymbol* node = new TIntermSymbol(id, name, getStage(), type);
     node->setLoc(loc);
     node->setConstArray(constArray);
     node->setConstSubtree(constSubtree);