Skip to content

A
angle
Commit f979524a by Jiawei-Shao Committed by Commit Bot
Options

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: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c5cacd60
Showing with 4 additions and 12 deletions
src/compiler/translator/RewriteTexelFetchOffset.cpp
...@@ -22,7 +22,6 @@ class Traverser : public TIntermTraverser ...@@ -22,7 +22,6 @@ class Traverser : public TIntermTraverser
{ {
public: public:
static void Apply(TIntermNode *root, static void Apply(TIntermNode *root,
unsigned int *tempIndex,
const TSymbolTable &symbolTable, const TSymbolTable &symbolTable,
int shaderVersion); int shaderVersion);
...@@ -43,12 +42,10 @@ Traverser::Traverser(const TSymbolTable &symbolTable, int shaderVersion) ...@@ -43,12 +42,10 @@ Traverser::Traverser(const TSymbolTable &symbolTable, int shaderVersion)
// static // static
void Traverser::Apply(TIntermNode *root, void Traverser::Apply(TIntermNode *root,
unsigned int *tempIndex,
const TSymbolTable &symbolTable, const TSymbolTable &symbolTable,
int shaderVersion) int shaderVersion)
{ {
Traverser traverser(symbolTable, shaderVersion); Traverser traverser(symbolTable, shaderVersion);
traverser.useTemporaryIndex(tempIndex);
do do
{ {
traverser.nextIteration(); traverser.nextIteration();
...@@ -63,7 +60,6 @@ void Traverser::Apply(TIntermNode *root, ...@@ -63,7 +60,6 @@ void Traverser::Apply(TIntermNode *root,
void Traverser::nextIteration() void Traverser::nextIteration()
{ {
mFound = false; mFound = false;
nextTemporaryIndex();
} }
bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node) bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
...@@ -87,7 +83,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node) ...@@ -87,7 +83,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
// Potential problem case detected, apply workaround. // Potential problem case detected, apply workaround.
const TIntermSequence *sequence = node->getSequence(); const TIntermSequence *sequence = node->getSequence();
ASSERT(sequence->size() == 4u); ASSERT(sequence->size() == 4u);
nextTemporaryIndex();
// Decide if there is a 2DArray sampler. // Decide if there is a 2DArray sampler.
bool is2DArray = node->getName().find("s2a1") != TString::npos; bool is2DArray = node->getName().find("s2a1") != TString::npos;
...@@ -163,7 +158,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node) ...@@ -163,7 +158,6 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
} // anonymous namespace } // anonymous namespace
void RewriteTexelFetchOffset(TIntermNode *root, void RewriteTexelFetchOffset(TIntermNode *root,
unsigned int *tempIndex,
const TSymbolTable &symbolTable, const TSymbolTable &symbolTable,
int shaderVersion) int shaderVersion)
{ {
...@@ -171,7 +165,7 @@ void RewriteTexelFetchOffset(TIntermNode *root, ...@@ -171,7 +165,7 @@ void RewriteTexelFetchOffset(TIntermNode *root,
if (shaderVersion < 300) if (shaderVersion < 300)
return; return;
Traverser::Apply(root, tempIndex, symbolTable, shaderVersion); Traverser::Apply(root, symbolTable, shaderVersion);
} }
} // namespace sh } // namespace sh
\ No newline at end of file
src/compiler/translator/RewriteTexelFetchOffset.h
...@@ -22,7 +22,6 @@ namespace sh ...@@ -22,7 +22,6 @@ namespace sh
{ {
void RewriteTexelFetchOffset(TIntermNode *root, void RewriteTexelFetchOffset(TIntermNode *root,
unsigned int *tempIndex,
const TSymbolTable &symbolTable, const TSymbolTable &symbolTable,
int shaderVersion); int shaderVersion);
......
src/compiler/translator/TranslatorGLSL.cpp
...@@ -79,8 +79,7 @@ void TranslatorGLSL::translate(TIntermNode *root, ShCompileOptions compileOption ...@@ -79,8 +79,7 @@ void TranslatorGLSL::translate(TIntermNode *root, ShCompileOptions compileOption
if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0) if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0)
{ {
sh::RewriteTexelFetchOffset(root, getTemporaryIndex(), getSymbolTable(), sh::RewriteTexelFetchOffset(root, getSymbolTable(), getShaderVersion());
getShaderVersion());
} }
bool precisionEmulation = getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision; bool precisionEmulation = getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision;
......
src/compiler/translator/TranslatorHLSL.cpp
...@@ -102,8 +102,7 @@ void TranslatorHLSL::translate(TIntermNode *root, ShCompileOptions compileOption ...@@ -102,8 +102,7 @@ void TranslatorHLSL::translate(TIntermNode *root, ShCompileOptions compileOption
if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0) if ((compileOptions & SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH) != 0)
{ {
sh::RewriteTexelFetchOffset(root, getTemporaryIndex(), getSymbolTable(), sh::RewriteTexelFetchOffset(root, getSymbolTable(), getShaderVersion());
getShaderVersion());
} }
if (((compileOptions & SH_REWRITE_INTEGER_UNARY_MINUS_OPERATOR) != 0) && if (((compileOptions & SH_REWRITE_INTEGER_UNARY_MINUS_OPERATOR) != 0) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment