Fix #1471: Merge shift amounts for different sets: --stb ... --std ...

2018-08-12 22:05:59 -06:00
parent ade8bbbf5f
commit 251901ac8a
4 changed files with 21 additions and 15 deletions
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -322,7 +322,7 @@ void ProcessBindingBase(int& argc, char**& argv, glslang::TResourceType res)

    for (int lang = langMin; lang < langMax; ++lang) {
        if (!perSetBase.empty())
-            baseBindingForSet[res][lang] = perSetBase;
+            baseBindingForSet[res][lang].insert(perSetBase.begin(), perSetBase.end());
        else
            baseBinding[res][lang] = singleBase;
    }