Skip to content

A
angle
Commit 298f9076 by shannonwoods@chromium.org
Options

Eliminated an unused parameter.

TRAC #23185 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2410 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 302adfef
Showing with 35 additions and 36 deletions
src/compiler/Intermediate.cpp
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "compiler/localintermediate.h" #include "compiler/localintermediate.h"
#include "compiler/QualifierAlive.h" #include "compiler/QualifierAlive.h"
#include "compiler/RemoveTree.h" #include "compiler/RemoveTree.h"
#include "compiler/SymbolTable.h"
bool CompareStructure(const TType& leftNodeType, ConstantUnion* rightUnionArray, ConstantUnion* leftUnionArray); bool CompareStructure(const TType& leftNodeType, ConstantUnion* rightUnionArray, ConstantUnion* leftUnionArray);
...@@ -153,7 +154,7 @@ TIntermSymbol* TIntermediate::addSymbol(int id, const TString& name, const TType ...@@ -153,7 +154,7 @@ TIntermSymbol* TIntermediate::addSymbol(int id, const TString& name, const TType
// //
// Returns the added node. // Returns the added node.
// //
TIntermTyped* TIntermediate::addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc line, TSymbolTable& symbolTable) TIntermTyped* TIntermediate::addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc line)
{ {
switch (op) { switch (op) {
case EOpEqual: case EOpEqual:
...@@ -288,7 +289,7 @@ TIntermTyped* TIntermediate::addIndex(TOperator op, TIntermTyped* base, TIntermT ...@@ -288,7 +289,7 @@ TIntermTyped* TIntermediate::addIndex(TOperator op, TIntermTyped* base, TIntermT
// //
// Returns the added node. // Returns the added node.
// //
TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermNode* childNode, TSourceLoc line, TSymbolTable& symbolTable) TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermNode* childNode, TSourceLoc line)
{ {
TIntermUnary* node; TIntermUnary* node;
TIntermTyped* child = childNode->getAsTyped(); TIntermTyped* child = childNode->getAsTyped();
......
src/compiler/ParseHelper.cpp
...@@ -1340,10 +1340,10 @@ TIntermTyped* TParseContext::foldConstConstructor(TIntermAggregate* aggrNode, co ...@@ -1340,10 +1340,10 @@ TIntermTyped* TParseContext::foldConstConstructor(TIntermAggregate* aggrNode, co
bool returnVal = false; bool returnVal = false;
ConstantUnion* unionArray = new ConstantUnion[type.getObjectSize()]; ConstantUnion* unionArray = new ConstantUnion[type.getObjectSize()];
if (aggrNode->getSequence().size() == 1) { if (aggrNode->getSequence().size() == 1) {
returnVal = intermediate.parseConstTree(aggrNode->getLine(), aggrNode, unionArray, aggrNode->getOp(), symbolTable, type, true); returnVal = intermediate.parseConstTree(aggrNode->getLine(), aggrNode, unionArray, aggrNode->getOp(), type, true);
} }
else { else {
returnVal = intermediate.parseConstTree(aggrNode->getLine(), aggrNode, unionArray, aggrNode->getOp(), symbolTable, type); returnVal = intermediate.parseConstTree(aggrNode->getLine(), aggrNode, unionArray, aggrNode->getOp(), type);
} }
if (returnVal) if (returnVal)
return 0; return 0;
...@@ -1407,7 +1407,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType* type, TOperator op, T ...@@ -1407,7 +1407,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType* type, TOperator op, T
return 0; return 0;
} }
newNode = intermediate.addUnaryMath(basicOp, node, node->getLine(), symbolTable); newNode = intermediate.addUnaryMath(basicOp, node, node->getLine());
if (newNode == 0) { if (newNode == 0) {
error(line, "can't convert", "constructor"); error(line, "can't convert", "constructor");
return 0; return 0;
......
src/compiler/glslang.y
...@@ -269,7 +269,7 @@ postfix_expression ...@@ -269,7 +269,7 @@ postfix_expression
| postfix_expression INC_OP { | postfix_expression INC_OP {
if (context->lValueErrorCheck($2.line, "++", $1)) if (context->lValueErrorCheck($2.line, "++", $1))
context->recover(); context->recover();
$$ = context->intermediate.addUnaryMath(EOpPostIncrement, $1, $2.line, context->symbolTable); $$ = context->intermediate.addUnaryMath(EOpPostIncrement, $1, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->unaryOpError($2.line, "++", $1->getCompleteString()); context->unaryOpError($2.line, "++", $1->getCompleteString());
context->recover(); context->recover();
...@@ -279,7 +279,7 @@ postfix_expression ...@@ -279,7 +279,7 @@ postfix_expression
| postfix_expression DEC_OP { | postfix_expression DEC_OP {
if (context->lValueErrorCheck($2.line, "--", $1)) if (context->lValueErrorCheck($2.line, "--", $1))
context->recover(); context->recover();
$$ = context->intermediate.addUnaryMath(EOpPostDecrement, $1, $2.line, context->symbolTable); $$ = context->intermediate.addUnaryMath(EOpPostDecrement, $1, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->unaryOpError($2.line, "--", $1->getCompleteString()); context->unaryOpError($2.line, "--", $1->getCompleteString());
context->recover(); context->recover();
...@@ -347,7 +347,7 @@ function_call ...@@ -347,7 +347,7 @@ function_call
// //
// Treat it like a built-in unary operator. // Treat it like a built-in unary operator.
// //
$$ = context->intermediate.addUnaryMath(op, $1.intermNode, 0, context->symbolTable); $$ = context->intermediate.addUnaryMath(op, $1.intermNode, 0);
if ($$ == 0) { if ($$ == 0) {
std::stringstream extraInfoStream; std::stringstream extraInfoStream;
extraInfoStream << "built in unary operator function. Type: " << static_cast<TIntermTyped*>($1.intermNode)->getCompleteString(); extraInfoStream << "built in unary operator function. Type: " << static_cast<TIntermTyped*>($1.intermNode)->getCompleteString();
...@@ -479,7 +479,7 @@ unary_expression ...@@ -479,7 +479,7 @@ unary_expression
| INC_OP unary_expression { | INC_OP unary_expression {
if (context->lValueErrorCheck($1.line, "++", $2)) if (context->lValueErrorCheck($1.line, "++", $2))
context->recover(); context->recover();
$$ = context->intermediate.addUnaryMath(EOpPreIncrement, $2, $1.line, context->symbolTable); $$ = context->intermediate.addUnaryMath(EOpPreIncrement, $2, $1.line);
if ($$ == 0) { if ($$ == 0) {
context->unaryOpError($1.line, "++", $2->getCompleteString()); context->unaryOpError($1.line, "++", $2->getCompleteString());
context->recover(); context->recover();
...@@ -489,7 +489,7 @@ unary_expression ...@@ -489,7 +489,7 @@ unary_expression
| DEC_OP unary_expression { | DEC_OP unary_expression {
if (context->lValueErrorCheck($1.line, "--", $2)) if (context->lValueErrorCheck($1.line, "--", $2))
context->recover(); context->recover();
$$ = context->intermediate.addUnaryMath(EOpPreDecrement, $2, $1.line, context->symbolTable); $$ = context->intermediate.addUnaryMath(EOpPreDecrement, $2, $1.line);
if ($$ == 0) { if ($$ == 0) {
context->unaryOpError($1.line, "--", $2->getCompleteString()); context->unaryOpError($1.line, "--", $2->getCompleteString());
context->recover(); context->recover();
...@@ -498,7 +498,7 @@ unary_expression ...@@ -498,7 +498,7 @@ unary_expression
} }
| unary_operator unary_expression { | unary_operator unary_expression {
if ($1.op != EOpNull) { if ($1.op != EOpNull) {
$$ = context->intermediate.addUnaryMath($1.op, $2, $1.line, context->symbolTable); $$ = context->intermediate.addUnaryMath($1.op, $2, $1.line);
if ($$ == 0) { if ($$ == 0) {
const char* errorOp = ""; const char* errorOp = "";
switch($1.op) { switch($1.op) {
...@@ -527,7 +527,7 @@ multiplicative_expression ...@@ -527,7 +527,7 @@ multiplicative_expression
: unary_expression { $$ = $1; } : unary_expression { $$ = $1; }
| multiplicative_expression STAR unary_expression { | multiplicative_expression STAR unary_expression {
FRAG_VERT_ONLY("*", $2.line); FRAG_VERT_ONLY("*", $2.line);
$$ = context->intermediate.addBinaryMath(EOpMul, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpMul, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "*", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "*", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -536,7 +536,7 @@ multiplicative_expression ...@@ -536,7 +536,7 @@ multiplicative_expression
} }
| multiplicative_expression SLASH unary_expression { | multiplicative_expression SLASH unary_expression {
FRAG_VERT_ONLY("/", $2.line); FRAG_VERT_ONLY("/", $2.line);
$$ = context->intermediate.addBinaryMath(EOpDiv, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpDiv, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "/", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "/", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -548,7 +548,7 @@ multiplicative_expression ...@@ -548,7 +548,7 @@ multiplicative_expression
additive_expression additive_expression
: multiplicative_expression { $$ = $1; } : multiplicative_expression { $$ = $1; }
| additive_expression PLUS multiplicative_expression { | additive_expression PLUS multiplicative_expression {
$$ = context->intermediate.addBinaryMath(EOpAdd, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpAdd, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "+", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "+", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -556,7 +556,7 @@ additive_expression ...@@ -556,7 +556,7 @@ additive_expression
} }
} }
| additive_expression DASH multiplicative_expression { | additive_expression DASH multiplicative_expression {
$$ = context->intermediate.addBinaryMath(EOpSub, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpSub, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "-", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "-", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -572,7 +572,7 @@ shift_expression ...@@ -572,7 +572,7 @@ shift_expression
relational_expression relational_expression
: shift_expression { $$ = $1; } : shift_expression { $$ = $1; }
| relational_expression LEFT_ANGLE shift_expression { | relational_expression LEFT_ANGLE shift_expression {
$$ = context->intermediate.addBinaryMath(EOpLessThan, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpLessThan, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "<", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "<", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -582,7 +582,7 @@ relational_expression ...@@ -582,7 +582,7 @@ relational_expression
} }
} }
| relational_expression RIGHT_ANGLE shift_expression { | relational_expression RIGHT_ANGLE shift_expression {
$$ = context->intermediate.addBinaryMath(EOpGreaterThan, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpGreaterThan, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, ">", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, ">", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -592,7 +592,7 @@ relational_expression ...@@ -592,7 +592,7 @@ relational_expression
} }
} }
| relational_expression LE_OP shift_expression { | relational_expression LE_OP shift_expression {
$$ = context->intermediate.addBinaryMath(EOpLessThanEqual, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpLessThanEqual, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "<=", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "<=", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -602,7 +602,7 @@ relational_expression ...@@ -602,7 +602,7 @@ relational_expression
} }
} }
| relational_expression GE_OP shift_expression { | relational_expression GE_OP shift_expression {
$$ = context->intermediate.addBinaryMath(EOpGreaterThanEqual, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpGreaterThanEqual, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, ">=", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, ">=", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -616,7 +616,7 @@ relational_expression ...@@ -616,7 +616,7 @@ relational_expression
equality_expression equality_expression
: relational_expression { $$ = $1; } : relational_expression { $$ = $1; }
| equality_expression EQ_OP relational_expression { | equality_expression EQ_OP relational_expression {
$$ = context->intermediate.addBinaryMath(EOpEqual, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpEqual, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "==", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "==", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -626,7 +626,7 @@ equality_expression ...@@ -626,7 +626,7 @@ equality_expression
} }
} }
| equality_expression NE_OP relational_expression { | equality_expression NE_OP relational_expression {
$$ = context->intermediate.addBinaryMath(EOpNotEqual, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpNotEqual, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "!=", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "!=", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -652,7 +652,7 @@ inclusive_or_expression ...@@ -652,7 +652,7 @@ inclusive_or_expression
logical_and_expression logical_and_expression
: inclusive_or_expression { $$ = $1; } : inclusive_or_expression { $$ = $1; }
| logical_and_expression AND_OP inclusive_or_expression { | logical_and_expression AND_OP inclusive_or_expression {
$$ = context->intermediate.addBinaryMath(EOpLogicalAnd, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpLogicalAnd, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "&&", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "&&", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -666,7 +666,7 @@ logical_and_expression ...@@ -666,7 +666,7 @@ logical_and_expression
logical_xor_expression logical_xor_expression
: logical_and_expression { $$ = $1; } : logical_and_expression { $$ = $1; }
| logical_xor_expression XOR_OP logical_and_expression { | logical_xor_expression XOR_OP logical_and_expression {
$$ = context->intermediate.addBinaryMath(EOpLogicalXor, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpLogicalXor, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "^^", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "^^", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
...@@ -680,7 +680,7 @@ logical_xor_expression ...@@ -680,7 +680,7 @@ logical_xor_expression
logical_or_expression logical_or_expression
: logical_xor_expression { $$ = $1; } : logical_xor_expression { $$ = $1; }
| logical_or_expression OR_OP logical_xor_expression { | logical_or_expression OR_OP logical_xor_expression {
$$ = context->intermediate.addBinaryMath(EOpLogicalOr, $1, $3, $2.line, context->symbolTable); $$ = context->intermediate.addBinaryMath(EOpLogicalOr, $1, $3, $2.line);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError($2.line, "||", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError($2.line, "||", $1->getCompleteString(), $3->getCompleteString());
context->recover(); context->recover();
......
src/compiler/intermOut.cpp
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "compiler/localintermediate.h" #include "compiler/localintermediate.h"
#include "compiler/SymbolTable.h"
// //
// Two purposes: // Two purposes:
......
src/compiler/localintermediate.h
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "compiler/intermediate.h" #include "compiler/intermediate.h"
#include "compiler/SymbolTable.h"
struct TVectorFields { struct TVectorFields {
int offsets[4]; int offsets[4];
...@@ -27,10 +26,10 @@ public: ...@@ -27,10 +26,10 @@ public:
TIntermediate(TInfoSink& i) : infoSink(i) { } TIntermediate(TInfoSink& i) : infoSink(i) { }
TIntermSymbol* addSymbol(int Id, const TString&, const TType&, TSourceLoc); TIntermSymbol* addSymbol(int Id, const TString&, const TType&, TSourceLoc);
TIntermTyped* addConversion(TOperator, const TType&, TIntermTyped*); TIntermTyped* addConversion(TOperator, const TType&, TIntermTyped*);
TIntermTyped* addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc, TSymbolTable&); TIntermTyped* addBinaryMath(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc);
TIntermTyped* addAssign(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc); TIntermTyped* addAssign(TOperator op, TIntermTyped* left, TIntermTyped* right, TSourceLoc);
TIntermTyped* addIndex(TOperator op, TIntermTyped* base, TIntermTyped* index, TSourceLoc); TIntermTyped* addIndex(TOperator op, TIntermTyped* base, TIntermTyped* index, TSourceLoc);
TIntermTyped* addUnaryMath(TOperator op, TIntermNode* child, TSourceLoc, TSymbolTable&); TIntermTyped* addUnaryMath(TOperator op, TIntermNode* child, TSourceLoc);
TIntermAggregate* growAggregate(TIntermNode* left, TIntermNode* right, TSourceLoc); TIntermAggregate* growAggregate(TIntermNode* left, TIntermNode* right, TSourceLoc);
TIntermAggregate* makeAggregate(TIntermNode* node, TSourceLoc); TIntermAggregate* makeAggregate(TIntermNode* node, TSourceLoc);
TIntermAggregate* setAggregateOperator(TIntermNode*, TOperator, TSourceLoc); TIntermAggregate* setAggregateOperator(TIntermNode*, TOperator, TSourceLoc);
...@@ -39,7 +38,7 @@ public: ...@@ -39,7 +38,7 @@ public:
TIntermTyped* addComma(TIntermTyped* left, TIntermTyped* right, TSourceLoc); TIntermTyped* addComma(TIntermTyped* left, TIntermTyped* right, TSourceLoc);
TIntermConstantUnion* addConstantUnion(ConstantUnion*, const TType&, TSourceLoc); TIntermConstantUnion* addConstantUnion(ConstantUnion*, const TType&, TSourceLoc);
TIntermTyped* promoteConstantUnion(TBasicType, TIntermConstantUnion*) ; TIntermTyped* promoteConstantUnion(TBasicType, TIntermConstantUnion*) ;
bool parseConstTree(TSourceLoc, TIntermNode*, ConstantUnion*, TOperator, TSymbolTable&, TType, bool singleConstantParam = false); bool parseConstTree(TSourceLoc, TIntermNode*, ConstantUnion*, TOperator, TType, bool singleConstantParam = false);
TIntermNode* addLoop(TLoopType, TIntermNode*, TIntermTyped*, TIntermTyped*, TIntermNode*, TSourceLoc); TIntermNode* addLoop(TLoopType, TIntermNode*, TIntermTyped*, TIntermTyped*, TIntermNode*, TSourceLoc);
TIntermBranch* addBranch(TOperator, TSourceLoc); TIntermBranch* addBranch(TOperator, TSourceLoc);
TIntermBranch* addBranch(TOperator, TIntermTyped*, TSourceLoc); TIntermBranch* addBranch(TOperator, TIntermTyped*, TSourceLoc);
......
src/compiler/parseConst.cpp
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// //
class TConstTraverser : public TIntermTraverser { class TConstTraverser : public TIntermTraverser {
public: public:
TConstTraverser(ConstantUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType& t) TConstTraverser(ConstantUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TType& t)
: error(false), : error(false),
index(0), index(0),
unionArray(cUnion), unionArray(cUnion),
...@@ -20,7 +20,6 @@ public: ...@@ -20,7 +20,6 @@ public:
constructorType(constructType), constructorType(constructType),
singleConstantParam(singleConstParam), singleConstantParam(singleConstParam),
infoSink(sink), infoSink(sink),
symbolTable(symTable),
size(0), size(0),
isDiagonalMatrixInit(false), isDiagonalMatrixInit(false),
matrixCols(0), matrixCols(0),
...@@ -45,7 +44,6 @@ protected: ...@@ -45,7 +44,6 @@ protected:
TOperator constructorType; TOperator constructorType;
bool singleConstantParam; bool singleConstantParam;
TInfoSink& infoSink; TInfoSink& infoSink;
TSymbolTable& symbolTable;
int size; // size of the constructor ( 4 for vec4) int size; // size of the constructor ( 4 for vec4)
bool isDiagonalMatrixInit; bool isDiagonalMatrixInit;
int matrixCols; // columns of the matrix int matrixCols; // columns of the matrix
...@@ -238,12 +236,12 @@ bool TConstTraverser::visitBranch(Visit visit, TIntermBranch* node) ...@@ -238,12 +236,12 @@ bool TConstTraverser::visitBranch(Visit visit, TIntermBranch* node)
// Individual functions can be initialized to 0 to skip processing of that // Individual functions can be initialized to 0 to skip processing of that
// type of node. It's children will still be processed. // type of node. It's children will still be processed.
// //
bool TIntermediate::parseConstTree(TSourceLoc line, TIntermNode* root, ConstantUnion* unionArray, TOperator constructorType, TSymbolTable& symbolTable, TType t, bool singleConstantParam) bool TIntermediate::parseConstTree(TSourceLoc line, TIntermNode* root, ConstantUnion* unionArray, TOperator constructorType, TType t, bool singleConstantParam)
{ {
if (root == 0) if (root == 0)
return false; return false;
TConstTraverser it(unionArray, singleConstantParam, constructorType, infoSink, symbolTable, t); TConstTraverser it(unionArray, singleConstantParam, constructorType, infoSink, t);
root->traverse(&it); root->traverse(&it);
if (it.error) if (it.error)
......
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