commit d5aedc199f127a1f8bda8079244a1cc275c1a12d
author John Kessenich <cepheus@frii.com> Sun Aug 06 19:42:42 2017 -0600
committer John Kessenich <cepheus@frii.com> Sun Aug 06 21:18:56 2017 -0600
tree 9167f6a959b59d23239379aca33a1c91195cc2cf
parent 7497e7c9f390716ed10fa41617ffa9b0a3fc1936

HLSL: Correct which things flattening tracks for linkage, based on caller, not type.

Includes related trackLinkage() code removal and name improvements.

hlsl/hlslParseHelper.h

diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h
index f4abea3..b615a13 100755
--- a/hlsl/hlslParseHelper.h
+++ b/hlsl/hlslParseHelper.h
@@ -133,7 +133,6 @@
     void mergeQualifiers(TQualifier& dst, const TQualifier& src);
     int computeSamplerTypeIndex(TSampler&);
     TSymbol* redeclareBuiltinVariable(const TSourceLoc&, const TString&, const TQualifier&, const TShaderQualifiers&);
-    void redeclareBuiltinBlock(const TSourceLoc&, TTypeList& typeList, const TString& blockName, const TString* instanceName, TArraySizes* arraySizes);
     void paramFix(TType& type);
     void specializationCheck(const TSourceLoc&, const TType&, const char* op);
 
@@ -256,19 +255,17 @@
     TType& split(TType& type, TString name, const TType* outerStructType = nullptr);
     void split(const TVariable&);
     bool wasSplit(const TIntermTyped* node) const;
-    bool wasSplit(int id) const { return splitIoVars.find(id) != splitIoVars.end(); }
-    TVariable* getSplitIoVar(const TIntermTyped* node) const;
-    TVariable* getSplitIoVar(const TVariable* var) const;
-    TVariable* getSplitIoVar(int id) const;
+    bool wasSplit(int id) const { return splitNonIoVars.find(id) != splitNonIoVars.end(); }
+    TVariable* getSplitNonIoVar(int id) const;
     void addPatchConstantInvocation();
     TIntermTyped* makeIntegerIndex(TIntermTyped*);
 
     void fixBuiltInIoType(TType&);
 
-    void flatten(const TVariable& variable);
-    int flatten(const TVariable& variable, const TType&, TFlattenData&, TString name);
-    int flattenStruct(const TVariable& variable, const TType&, TFlattenData&, TString name);
-    int flattenArray(const TVariable& variable, const TType&, TFlattenData&, TString name);
+    void flatten(const TVariable& variable, bool linkage);
+    int flatten(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage);
+    int flattenStruct(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage);
+    int flattenArray(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage);
 
     bool hasUniform(const TQualifier& qualifier) const;
     void clearUniform(TQualifier& qualifier);
@@ -382,7 +379,7 @@
     TMap<const TTypeList*, tIoKinds> ioTypeMap;
 
     // Structure splitting data:
-    TMap<int, TVariable*> splitIoVars;  // variables with the built-in interstage IO removed, indexed by unique ID.
+    TMap<int, TVariable*> splitNonIoVars;  // variables with the built-in interstage IO removed, indexed by unique ID.
 
     // Structuredbuffer shared types.  Typically there are only a few.
     TVector<TType*> structBufferTypes;