Compile-time check on sampler binding size, link-time merging and checking of bindings.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24218 e7fa87d3-cd2b-0410-9028-fcbf551c1848

1 files changed, 6 insertions, 1 deletions

diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp
index 139580bd..b0669128 100644
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -159,6 +159,10 @@ void TIntermediate::mergeLinkerObjects(TInfoSink& infoSink, TIntermSequence& lin
                 // the initializer

                 if (symbol->getConstArray().empty() && ! unitSymbol->getConstArray().empty())

                     symbol->setConstArray(unitSymbol->getConstArray());

+

+                // Similarly for binding

+                if (! symbol->getQualifier().hasBinding() && unitSymbol->getQualifier().hasBinding())

+                    symbol->getQualifier().layoutBinding = unitSymbol->getQualifier().layoutBinding;

                 

                 // Check for consistent types/qualification/initializers etc.

                 mergeErrorCheck(infoSink, *symbol, *unitSymbol, false);

@@ -230,7 +234,8 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
     // Layouts...

     if (symbol.getQualifier().layoutMatrix       != unitSymbol.getQualifier().layoutMatrix ||

         symbol.getQualifier().layoutPacking      != unitSymbol.getQualifier().layoutPacking ||

-        symbol.getQualifier().layoutSlotLocation != unitSymbol.getQualifier().layoutSlotLocation) {

+        symbol.getQualifier().layoutSlotLocation != unitSymbol.getQualifier().layoutSlotLocation ||

+        symbol.getQualifier().layoutBinding      != unitSymbol.getQualifier().layoutBinding) {

         error(infoSink, "Layout qualification must match:");

         writeTypeComparison = true;

     }