Skip to content

Commit 1830f22

Browse files
committed
Fixed bug with shader keywords
1 parent 2247123 commit 1830f22

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

Analyzer/Processors/ShaderProcessor.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public void Process(AnalyzerTool analyzer, long objectId, Dictionary<int, int> l
8888
foreach (var pass in subShader["m_Passes"])
8989
{
9090
int passNum = 0;
91-
ushort[] passKeywordIndices = { };
9291

9392
if (!keywordsUnity2021)
9493
{
@@ -101,15 +100,6 @@ public void Process(AnalyzerTool analyzer, long objectId, Dictionary<int, int> l
101100
m_KeywordNames[nameIndex["second"].GetValue<int>()] = nameIndex["first"].GetValue<string>();
102101
}
103102
}
104-
else
105-
{
106-
passKeywordIndices = pass["m_SerializedKeywordStateMask"].GetValue<ushort[]>();
107-
108-
foreach (var index in passKeywordIndices)
109-
{
110-
m_UniqueKeywords.Add(m_KeywordNames[index]);
111-
}
112-
}
113103

114104
foreach (var progType in s_progTypes)
115105
{
@@ -128,12 +118,12 @@ public void Process(AnalyzerTool analyzer, long objectId, Dictionary<int, int> l
128118
// And they are stored per hardware tiers.
129119
foreach (var tierProgram in program["m_PlayerSubPrograms"])
130120
{
131-
ProcessProgram(objectId, passNum, ref currentProgram, tierProgram, progType.typeName, passKeywordIndices, hwTier++);
121+
ProcessProgram(objectId, passNum, ref currentProgram, tierProgram, progType.typeName, hwTier++);
132122
}
133123
}
134124
else
135125
{
136-
ProcessProgram(objectId, passNum, ref currentProgram, program["m_SubPrograms"], progType.typeName, passKeywordIndices);
126+
ProcessProgram(objectId, passNum, ref currentProgram, program["m_SubPrograms"], progType.typeName);
137127
}
138128
}
139129

@@ -178,7 +168,7 @@ public void Process(AnalyzerTool analyzer, long objectId, Dictionary<int, int> l
178168
name = parsedForm["m_Name"].GetValue<string>();
179169
}
180170

181-
void ProcessProgram(long objectId, int passNum, ref int currentProgram, RandomAccessReader subPrograms, string shaderType, ushort[] passKeywordIndices, int hwTier = -1)
171+
void ProcessProgram(long objectId, int passNum, ref int currentProgram, RandomAccessReader subPrograms, string shaderType, int hwTier = -1)
182172
{
183173
foreach (var subProgram in subPrograms)
184174
{

0 commit comments

Comments
 (0)