Add ES 3.0 fragment output link-time test for outputs having or not having location qualifiers.

Test/150.vert

+#version 150 core
+
+in vec4 iv4;
+
+uniform float ps;
+
+invariant gl_Position;
+
+void main()
+{
+    gl_Position = iv4;
+    gl_PointSize = ps;
+    gl_ClipDistance[2] = iv4.x;
+}
+
+float gl_ClipDistance[4];
+
+uniform foob {
+    int a[];
+};
+int a[5]; // ERROR, resizing user-block member

Test/300link.frag

+#version 300 es
+
+precision highp float;
+
+out vec4 color1;
+out vec4 color2;
+
+void main() {}

Test/300link2.frag

+#version 300 es
+precision mediump float;
+in vec4 pos;
+
+layout(location = 1) out vec4 c;
+layout(location = 5) out vec4 p;
+layout(location = 9) out vec4 q[2];
+
+void main()
+{
+}

Test/300link3.frag

+#version 300 es
+
+precision highp float;
+
+out vec4 color1;
+
+void main() {}

Test/410.geom

+#version 410 core
+
+void main()
+{
+    gl_ViewportIndex = 7;
+}

Test/baseResults/150.vert.out

+Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
+ERROR: 0:13: 'gl_ClipDistance' : undeclared identifier 
+ERROR: 0:13: 'gl_ClipDistance' :  left of '[' is not of type array, matrix, or vector  
+ERROR: 0:13: 'assign' :  l-value required (can't modify a const)
+ERROR: 0:16: 'gl_' : reserved built-in name 
+ERROR: 0:21: 'a' : cannot redeclare a user-block member array 
+ERROR: 5 compilation errors.  No code generated.
+
+ERROR: node is still EOpNull!
+0:9  Function Definition: main( (void)
+0:9    Function Parameters: 
+0:11    Sequence
+0:11      move second child to first child (4-component vector of float)
+0:11        'gl_Position' (invariant gl_Position 4-component vector of float)
+0:11        'iv4' (in 4-component vector of float)
+0:12      move second child to first child (float)
+0:12        'gl_PointSize' (gl_PointSize float)
+0:12        'ps' (uniform float)
+0:13      move second child to first child (float)
+0:13        Constant:
+0:13          0.000000
+0:13        direct index (float)
+0:13          'iv4' (in 4-component vector of float)
+0:13          Constant:
+0:13            0 (const int)
+0:?   Linker Objects
+0:?     'iv4' (in 4-component vector of float)
+0:?     'ps' (uniform float)
+0:?     'gl_ClipDistance' (4-element array of float)
+0:?     '__anon__0' (layout(shared ) uniform block)
+0:?     'gl_VertexID' (gl_VertexId int)
+0:?     'gl_InstanceID' (gl_InstanceId int)
+

Test/baseResults/300link.frag.out

+300link.frag
+
+0:? Sequence
+0:8  Function Definition: main( (void)
+0:8    Function Parameters: 
+0:?   Linker Objects
+0:?     'color1' (out highp 4-component vector of float)
+0:?     'color2' (out highp 4-component vector of float)
+
+
+Linked fragment stage:
+
+ERROR: Linking fragment stage: when more than one fragment shader output, all must have location qualifiers
+
+

Test/baseResults/300link2.frag.out

+300link2.frag
+
+0:? Sequence
+0:9  Function Definition: main( (void)
+0:9    Function Parameters: 
+0:?   Linker Objects
+0:?     'pos' (smooth in mediump 4-component vector of float)
+0:?     'c' (layout(location=1 ) out mediump 4-component vector of float)
+0:?     'p' (layout(location=5 ) out mediump 4-component vector of float)
+0:?     'q' (layout(location=9 ) out 2-element array of mediump 4-component vector of float)
+
+
+Linked fragment stage:
+
+
+

Test/baseResults/300link3.frag.out

+300link3.frag
+
+0:? Sequence
+0:7  Function Definition: main( (void)
+0:7    Function Parameters: 
+0:?   Linker Objects
+0:?     'color1' (out highp 4-component vector of float)
+
+
+Linked fragment stage:
+
+
+

Test/baseResults/410.geom.out

+Warning, version 410 is not yet complete; some version-specific features are present, but many are missing.
+ERROR: 0:5: 'gl_ViewportIndex' : undeclared identifier 
+ERROR: 1 compilation errors.  No code generated.
+
+ERROR: node is still EOpNull!
+0:3  Function Definition: main( (void)
+0:3    Function Parameters: 
+0:5    Sequence
+0:5      move second child to first child (float)
+0:5        'gl_ViewportIndex' (float)
+0:5        Constant:
+0:5          7.000000
+0:?   Linker Objects
+

Test/runtests

@@ -38,6 +38,9 @@ runLinkTest mains1.frag mains2.frag noMain1.geom noMain2.geom
 runLinkTest noMain.vert mains.frag
 runLinkTest link1.frag link2.frag link3.frag
 runLinkTest recurse1.vert recurse1.frag recurse2.frag
+runLinkTest 300link.frag
+runLinkTest 300link2.frag
+runLinkTest 300link3.frag
 
 #
 # multi-threaded test

Test/testlist

@@ -12,6 +12,7 @@ versionsErrors.vert
 120.frag
 130.frag
 140.frag
+150.vert
 150.geom
 precision.frag
 precision.vert
@@ -52,6 +53,7 @@ numeral.frag
 400.geom
 400.tesc
 400.tese
+410.geom
 420.tese
 430.comp
 dce.frag

Todo.txt

@@ -8,25 +8,25 @@ Link Validation
     Cross-stage linking
       - type consistency check of uniform and ins <-> outs, both variables and blocks, stage-specific arrayness matching
       - location/binding/index check
-      - matching initializers for uniforms
       - mixed es/non-es profiles
       - statically consumed input not produced by previous stage
-      - matching between gl_PerVertex blocks and gl_PerFragment blocks
-      - compute shader not combined with any other stages
       - give error for sharing a packed block
+      - 1.2: matching initializers for uniforms
+      - 1.5: matching between gl_PerVertex blocks and gl_PerFragment blocks
       - 1.3: deprecated mixing fixed vertex/fragment stage with programmable fragment/vertex stage.
+      - 4.3: compute shader not combined with any other stages
       - 4.3: remove cross-version linking restrictions.
       - 4.3: Allow mismatches in interpolation and auxiliary qualification across stages.
 	  - 4.4: A stage contains two different blocks, each with no instance name, where the blocks contain a member with the same name.
     Intra-stage linking
+      - ES 3.0: location aliasing/overlap (except desktop vertex shader inputs)
+      + ES 3.0: fragment outputs all have locations, if more than one
       + exactly one main
       + Non ES: type consistency check of uniforms, globals, ins, and outs
       + Non ES: value checking of global const initializers
       + Non ES: value checking of uniform initializers
       + Non ES: location match
-      - gl_TexCoord can only have a max array size of up to gl_MaxTextureCoords
-      - location aliasing/overlap (except desktop vertex shader inputs)
-      - 1.0: count the number of uniforms and varyings, compare against limits
+      - Non ES: gl_TexCoord can only have a max array size of up to gl_MaxTextureCoords
       + recursion for functions
       - Non ES: block matching
       - Non ES: component/binding/index/offset match check
@@ -46,8 +46,8 @@ Link Validation
 
 Shader Functionality to Implement/Finish
     ESSL 2.0 (#version 100)
-      - implement non-inductive loop limitation detection
-      - implement non-inductive array accesses limitation detection
+      + implement non-inductive loop limitation detection
+      + implement non-inductive array accesses limitation detection
     ESSL 3.0
       - "const" compile-time constant propagation in the front-end has to be complete, for all built-in functions
     GLSL 1.2
@@ -72,7 +72,7 @@ Shader Functionality to Implement/Finish
         - Built-in uniforms except for depth range parameters
         - Built-in interface between vertex and fragment:  gl_TexCoord, gl_FogFragCoord, and all the color values.
         - Built-in two-sided coloring.
-        - Fixed functionality for a programmable stage.  Supply shaders for all stages currently being used.
+        - Fixed functionality for a programmable stage. 
         - ftransform().  Use invariant outputs instead.
     GLSL 1.5 (Non-ES)
       - Deprecated gl_MaxVaryingComponents

glslang.vcxproj

@@ -157,6 +157,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClCompile Include="glslang\MachineIndependent\InfoSink.cpp" />
     <ClCompile Include="glslang\MachineIndependent\Initialize.cpp" />
     <ClCompile Include="glslang\MachineIndependent\limits.cpp" />
+    <ClCompile Include="glslang\MachineIndependent\linkValidate.cpp" />
     <ClCompile Include="glslang\MachineIndependent\preprocessor\Pp.cpp" />
     <ClCompile Include="glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
     <ClCompile Include="glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
@@ -171,7 +172,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClCompile Include="glslang\MachineIndependent\Intermediate.cpp" />
     <ClCompile Include="glslang\MachineIndependent\ParseHelper.cpp" />
     <ClCompile Include="glslang\MachineIndependent\PoolAlloc.cpp" />
-    <ClCompile Include="glslang\MachineIndependent\QualifierAlive.cpp" />
     <ClCompile Include="glslang\MachineIndependent\RemoveTree.cpp" />
     <ClCompile Include="glslang\MachineIndependent\ShaderLang.cpp" />
     <ClCompile Include="glslang\MachineIndependent\SymbolTable.cpp" />
@@ -192,7 +192,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\ParseHelper.h" />
     <ClInclude Include="glslang\MachineIndependent\preprocessor\PpContext.h" />
     <ClInclude Include="glslang\MachineIndependent\preprocessor\PpTokens.h" />
-    <ClInclude Include="glslang\MachineIndependent\QualifierAlive.h" />
     <ClInclude Include="glslang\MachineIndependent\RemoveTree.h" />
     <ClInclude Include="glslang\MachineIndependent\localintermediate.h" />
     <ClInclude Include="glslang\Include\BaseTypes.h" />

glslang.vcxproj.filters

@@ -49,9 +49,6 @@
     <ClCompile Include="glslang\MachineIndependent\PoolAlloc.cpp">
       <Filter>Machine Independent</Filter>
     </ClCompile>
-    <ClCompile Include="glslang\MachineIndependent\QualifierAlive.cpp">
-      <Filter>Machine Independent</Filter>
-    </ClCompile>
     <ClCompile Include="glslang\MachineIndependent\RemoveTree.cpp">
       <Filter>Machine Independent</Filter>
     </ClCompile>
@@ -112,6 +109,9 @@
     <ClCompile Include="glslang\MachineIndependent\limits.cpp">
       <Filter>Machine Independent</Filter>
     </ClCompile>
+    <ClCompile Include="glslang\MachineIndependent\linkValidate.cpp">
+      <Filter>Machine Independent</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="glslang\MachineIndependent\Initialize.h">
@@ -120,9 +120,6 @@
     <ClInclude Include="glslang\MachineIndependent\ParseHelper.h">
       <Filter>Machine Independent</Filter>
     </ClInclude>
-    <ClInclude Include="glslang\MachineIndependent\QualifierAlive.h">
-      <Filter>Machine Independent</Filter>
-    </ClInclude>
     <ClInclude Include="glslang\MachineIndependent\RemoveTree.h">
       <Filter>Machine Independent</Filter>
     </ClInclude>

glslang/MachineIndependent/Makefile

@@ -9,12 +9,12 @@ LIBOSDEPENDENT=./../OSDependent/Linux/libOssource.a
 LIBINITIALISATION=./../../OGLCompilersDLL/libInitializeDll.a
 LIBCODEGEN=./../GenericCodeGen/libCodeGen.a
 OBJECTS= Initialize.o IntermTraverse.o \
-	Intermediate.o ParseHelper.o PoolAlloc.o QualifierAlive.o \
+	Intermediate.o ParseHelper.o PoolAlloc.o \
 	RemoveTree.o ShaderLang.o intermOut.o parseConst.o SymbolTable.o \
-	InfoSink.o Versions.o Constant.o Scan.o limits.o
+	InfoSink.o Versions.o Constant.o Scan.o limits.o linkValidate.o
 
 SRCS= gen_glslang_tab.cpp Initialize.cpp IntermTraverse.cpp \
-	Intermediate.cpp ParseHelper.cpp PoolAlloc.cp QualifierAlive.cpp \
+	Intermediate.cpp ParseHelper.cpp PoolAlloc.cp \
 	RemoveTree.cpp ShaderLang.cpp SymbolTable.cpp intermOut.cpp \
 	parseConst.cpp InfoSink.cpp Versions.cpp Constant.cpp Scan.cpp
 CPPFLAGS=$(DEFINE) $(INCLUDE) -fPIC
@@ -98,7 +98,7 @@ Intermediate.o: localintermediate.h ../Include/intermediate.h
 Intermediate.o: ../Public/ShaderLang.h SymbolTable.h ../Include/Common.h
 Intermediate.o: ../Include/intermediate.h ../Include/Types.h
 Intermediate.o: ../Include/BaseTypes.h ../Include/ConstantUnion.h
-Intermediate.o: ../Include/InfoSink.h QualifierAlive.h RemoveTree.h
+Intermediate.o: ../Include/InfoSink.h RemoveTree.h
 ParseHelper.o: ParseHelper.h ../Include/ShHandle.h
 ParseHelper.o: ../Public/ShaderLang.h ../Include/InfoSink.h
 ParseHelper.o: ../Include/Common.h ../Include/PoolAlloc.h SymbolTable.h
@@ -109,7 +109,6 @@ ParseHelper.o: localintermediate.h ../Include/intermediate.h
 ParseHelper.o: ../Public/ShaderLang.h
 ParseHelper.o: ../OSDependent/Linux/osinclude.h
 ParseHelper.o: ../Include/InitializeGlobals.h ../Include/PoolAlloc.h
-QualifierAlive.o: ../Include/intermediate.h
 Scan.o: Scan.h
 Scan.o: ParseHelper.h SymbolTable.h
 Scan.o: glslang_tab.cpp.h
@@ -147,3 +146,4 @@ InfoSink.o: ../Include/InfoSink.h
 Versions.o: ParseHelper.h  Versions.h ../Include/ShHandle.h SymbolTable.h localintermediate.h
 Constant.o: localintermediate.h ../Include/intermediate.h ../Public/ShaderLang.h SymbolTable.h Versions.h
 limits.o:  ParseHelper.h
+linkValidate.o: localintermediate.h

glslang/MachineIndependent/QualifierAlive.cpp

-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifdef USE_QUALIFIER_ALIVE
-
-#include "../Include/intermediate.h"
-
-namespace glslang {
-
-class TAliveTraverser : public TIntermTraverser {
-public:
-    TAliveTraverser(TStorageQualifier q) : TIntermTraverser(), found(false), qualifier(q)
-    {
-        visitSymbol    = AliveSymbol;
-        visitSelection = AliveSelection;
-        rightToLeft    = true;
-    }
-    bool wasFound() { return found; }
-protected:
-    bool found;
-    TStorageQualifier qualifier;
-
-    friend void AliveSymbol(TIntermSymbol*, TIntermTraverser*);
-    friend bool AliveSelection(bool, TIntermSelection*, TIntermTraverser*);
-};
-
-//
-// Report whether or not a variable of the given qualifier type
-// is guaranteed written.  Not always possible to determine if
-// it is written conditionally.
-//
-// It does not do this well yet, this is just a place holder
-// that simply determines if it was reference at all, anywhere.
-//
-bool QualifierWritten(TIntermNode* node, TStorageQualifier qualifier)
-{
-    TAliveTraverser it(qualifier);
-
-    if (node)
-        node->traverse(&it);
-
-    return it.wasFound();
-}
-
-void AliveSymbol(TIntermSymbol* node, TIntermTraverser* it)
-{
-    TAliveTraverser* lit = static_cast<TAliveTraverser*>(it);
-
-    //
-    // If it's what we're looking for, record it.
-    //
-    if (node->getQualifier().storage == lit->qualifier)
-        lit->found = true;
-}
-
-bool AliveSelection(bool preVisit, TIntermSelection* node, TIntermTraverser* it)
-{
-    TAliveTraverser* lit = static_cast<TAliveTraverser*>(it);
-
-    if (lit->wasFound())
-        return false;
-
-    return true;
-}
-
-} // end namespace glslang
-
-#endif

glslang/MachineIndependent/QualifierAlive.h

-//
-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above
-//    copyright notice, this list of conditions and the following
-//    disclaimer in the documentation and/or other materials provided
-//    with the distribution.
-//
-//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-//    contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
-
-namespace glslang {
-
-bool QualifierWritten(TIntermNode* root, TStorageQualifier);
-
-} // end namespace glslang

glslang/MachineIndependent/ShaderLang.cpp

@@ -145,7 +145,7 @@ bool InitializeSymbolTable(const TString& builtIns, int version, EProfile profil
 
     if (! parseContext.parseShaderStrings(ppContext, const_cast<char**>(builtInShaders), builtInLengths, 1) != 0) {
         infoSink.info.message(EPrefixInternalError, "Unable to parse built-ins");
-        printf("Unable to parse built-ins\n");
+        printf("Unable to parse built-ins\n%s\n", infoSink.info.c_str());
 
         return false;
     }

glslang/MachineIndependent/localintermediate.h

@@ -107,14 +107,16 @@ public:
 	void removeTree();
 
 protected:
+    void error(TInfoSink& infoSink, const char*);
     void mergeBodies(TInfoSink&, TIntermSequence& globals, const TIntermSequence& unitGlobals);
     void mergeLinkerObjects(TInfoSink&, TIntermSequence& linkerObjects, const TIntermSequence& unitLinkerObjects);
-    void error(TInfoSink& infoSink, const char*);
-    void linkErrorCheck(TInfoSink&, const TIntermSymbol&, const TIntermSymbol&, bool crossStage);
+    void mergeErrorCheck(TInfoSink&, const TIntermSymbol&, const TIntermSymbol&, bool crossStage);
     void checkCallGraphCycles(TInfoSink&);
+    void inOutLocationCheck(TInfoSink&);
+    TIntermSequence& findLinkerObjects();
 
 protected:
-    EShLanguage language;
+    const EShLanguage language;
     TIntermNode* treeRoot;
     EProfile profile;
     int version;