Remove redundant code in RewriteTexelFetchOffset

Remove useTemporaryIndex() in function RewriteTexelFetchOffset since no temporary variables will be created in this function. BUG=angleproject:1469 Change-Id: Ibed56f0ba5c89b6ae1ab1611de39514c3fbb600f Reviewed-on: https://chromium-review.googlesource.com/387198Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Remove redundant code in RewriteTexelFetchOffset
f979524a · Jiawei-Shao · Commit Bot · c5cacd60 · f979524a · f979524a
Commit f979524a authored Sep 21, 2016 by Jiawei-Shao Committed by Commit Bot Sep 22, 2016
4 changed files
--- a/src/compiler/translator/RewriteTexelFetchOffset.cpp
+++ b/src/compiler/translator/RewriteTexelFetchOffset.cpp
@@ -22,7 +22,6 @@ class Traverser : public TIntermTraverser
 {
  public:
    static void Apply(TIntermNode *root,
-                      unsigned int *tempIndex,
                      const TSymbolTable &symbolTable,
                      int shaderVersion);

@@ -43,12 +42,10 @@ Traverser::Traverser(const TSymbolTable &symbolTable, int shaderVersion)

 // static
 void Traverser::Apply(TIntermNode *root,
-                      unsigned int *tempIndex,
                      const TSymbolTable &symbolTable,
                      int shaderVersion)
 {
    Traverser traverser(symbolTable, shaderVersion);
-    traverser.useTemporaryIndex(tempIndex);
    do
    {
        traverser.nextIteration();
@@ -63,7 +60,6 @@ void Traverser::Apply(TIntermNode *root,
 void Traverser::nextIteration()
 {
    mFound = false;
-    nextTemporaryIndex();
 }

 bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
@@ -87,7 +83,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
    // Potential problem case detected, apply workaround.
    const TIntermSequence *sequence = node->getSequence();
    ASSERT(sequence->size() == 4u);
-    nextTemporaryIndex();

    // Decide if there is a 2DArray sampler.
    bool is2DArray = node->getName().find("s2a1") != TString::npos;
@@ -163,7 +158,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
 }  // anonymous namespace

 void RewriteTexelFetchOffset(TIntermNode *root,
-                             unsigned int *tempIndex,
                             const TSymbolTable &symbolTable,
                             int shaderVersion)
 {
@@ -171,7 +165,7 @@ void RewriteTexelFetchOffset(TIntermNode *root,
    if (shaderVersion < 300)
        return;

-    Traverser::Apply(root, tempIndex, symbolTable, shaderVersion);
+    Traverser::Apply(root, symbolTable, shaderVersion);
 }

 }  // namespace sh
\ No newline at end of file
--- a/src/compiler/translator/RewriteTexelFetchOffset.h
+++ b/src/compiler/translator/RewriteTexelFetchOffset.h
@@ -22,7 +22,6 @@ namespace sh
 {

 void RewriteTexelFetchOffset(TIntermNode *root,
-                             unsigned int *tempIndex,
                             const TSymbolTable &symbolTable,
                             int shaderVersion);


--- a/src/compiler/translator/TranslatorGLSL.cpp
+++ b/src/compiler/translator/TranslatorGLSL.cpp
@@ -79,8 +79,7 @@ void TranslatorGLSL::translate(TIntermNode *root, ShCompileOptions compileOption

    if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0)
    {
-        sh::RewriteTexelFetchOffset(root, getTemporaryIndex(), getSymbolTable(),
-                                    getShaderVersion());
+        sh::RewriteTexelFetchOffset(root, getSymbolTable(), getShaderVersion());
    }

    bool precisionEmulation = getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision;

--- a/src/compiler/translator/TranslatorHLSL.cpp
+++ b/src/compiler/translator/TranslatorHLSL.cpp
@@ -102,8 +102,7 @@ void TranslatorHLSL::translate(TIntermNode *root, ShCompileOptions compileOption

    if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0)
    {
-        sh::RewriteTexelFetchOffset(root, getTemporaryIndex(), getSymbolTable(),
-                                    getShaderVersion());
+        sh::RewriteTexelFetchOffset(root, getSymbolTable(), getShaderVersion());
    }

    if (((compileOptions & SH_REWRITE_INTEGER_UNARY_MINUS_OPERATOR) != 0) &&