Hash interface block names and field names.

BUG=544853 Change-Id: I4ca77ed87c15a168c696c15f2438ad21c00985f6 Reviewed-on: https://chromium-review.googlesource.com/310271Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Hash interface block names and field names.
dbfdca8f · Jeff Muizelaar · Jamie Madill · fe80abac · dbfdca8f
Commit dbfdca8f authored Nov 06, 2015 by Jeff Muizelaar Committed by Jamie Madill Nov 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

VariableInfo.cpp src/compiler/translator/VariableInfo.cpp +3 -2

No files found.
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -551,7 +551,8 @@ void CollectVariables::visitVariable(const TIntermSymbol *variable,
    ASSERT(blockType);

    interfaceBlock.name = blockType->name().c_str();
-    interfaceBlock.mappedName = TIntermTraverser::hash(variable->getSymbol(), mHashFunction).c_str();
+    interfaceBlock.mappedName =
+        TIntermTraverser::hash(blockType->name().c_str(), mHashFunction).c_str();
    interfaceBlock.instanceName = (blockType->hasInstanceName() ? blockType->instanceName().c_str() : "");
    interfaceBlock.arraySize = variable->getArraySize();
    interfaceBlock.isRowMajorLayout = (blockType->matrixPacking() == EmpRowMajor);
@@ -566,7 +567,7 @@ void CollectVariables::visitVariable(const TIntermSymbol *variable,
        const TString &fullFieldName = InterfaceBlockFieldName(*blockType, field);
        const TType &fieldType = *field.type();

-        GetVariableTraverser traverser(mSymbolTable);
+        NameHashingTraverser traverser(mHashFunction, mSymbolTable);
        traverser.traverse(fieldType, fullFieldName, &interfaceBlock.fields);

        interfaceBlock.fields.back().isRowMajorLayout = (fieldType.getLayoutQualifier().matrixPacking == EmpRowMajor);