sort the uniforms list deterministically (by name instead of by address)

aras-p · Mar 8, 2013 · a959287 · a959287
1 parent 838e841
commit a959287
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/hlslang/GLSLCodeGen/hlslLinker.cpp b/hlslang/GLSLCodeGen/hlslLinker.cpp
@@ -711,6 +711,11 @@ bool HlslLinker::buildFunctionLists(HlslCrossCompiler* comp, EShLanguage lang, c
 	return true;
 }
 
+struct GlslSymbolSorter {
+	bool operator()(const GlslSymbol* a, const GlslSymbol* b) {
+		return a->getName() < b->getName();
+	}
+};
 
 void HlslLinker::buildUniformsAndLibFunctions(const FunctionSet& calledFunctions, std::vector<GlslSymbol*>& constants, std::set<TOperator>& libFunctions)
 {
@@ -730,7 +735,7 @@ void HlslLinker::buildUniformsAndLibFunctions(const FunctionSet& calledFunctions
 	}
 
     // std::unique only removes contiguous duplicates, so vector must be sorted to remove them all
-    std::sort(constants.begin(), constants.end());
+    std::sort(constants.begin(), constants.end(), GlslSymbolSorter());
 
 	// Remove duplicates
 	constants.resize(std::unique(constants.begin(), constants.end()) - constants.begin());