Skip to content

A
angle
Commit a499cfc5 by alokp@chromium.org
Options

Fixed multiple issues with struct declaration and construction.

Review URL: http://codereview.appspot.com/1076041 git-svn-id: https://angleproject.googlecode.com/svn/trunk@220 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 2986a8cb
Showing with 108 additions and 93 deletions
src/compiler/OutputGLSL.cpp
...@@ -38,56 +38,15 @@ TString getTypeName(const TType& type) ...@@ -38,56 +38,15 @@ TString getTypeName(const TType& type)
} }
return TString(out.c_str()); return TString(out.c_str());
} }
TString getIndentationString(int depth)
{
TString indentation(depth, ' ');
return indentation;
}
} // namespace } // namespace
TOutputGLSL::TOutputGLSL(TParseContext &context) TOutputGLSL::TOutputGLSL(TInfoSinkBase& objSink)
: TIntermTraverser(true, true, true), : TIntermTraverser(true, true, true),
writeFullSymbol(false), mObjSink(objSink),
parseContext(context) mWriteFullSymbol(false)
{ {
} }
// Header declares user-defined structs.
void TOutputGLSL::header()
{
TInfoSinkBase& out = objSink();
TSymbolTableLevel* symbols = parseContext.symbolTable.getGlobalLevel();
for (TSymbolTableLevel::const_iterator symbolIter = symbols->begin(); symbolIter != symbols->end(); ++symbolIter)
{
const TSymbol* symbol = symbolIter->second;
if (!symbol->isVariable())
continue;
const TVariable* variable = static_cast<const TVariable*>(symbol);
if (!variable->isUserType())
continue;
const TType& type = variable->getType();
ASSERT(type.getQualifier() == EvqTemporary);
ASSERT(type.getBasicType() == EbtStruct);
out << "struct " << variable->getName() << "{\n";
const TTypeList* structure = type.getStruct();
ASSERT(structure != NULL);
incrementDepth();
for (size_t i = 0; i < structure->size(); ++i) {
const TType* fieldType = (*structure)[i].type;
ASSERT(fieldType != NULL);
out << getIndentationString(depth);
out << getTypeName(*fieldType) << " " << fieldType->getFieldName() << ";\n";
}
decrementDepth();
out << "};\n";
}
}
void TOutputGLSL::writeTriplet(Visit visit, const char* preStr, const char* inStr, const char* postStr) void TOutputGLSL::writeTriplet(Visit visit, const char* preStr, const char* inStr, const char* postStr)
{ {
TInfoSinkBase& out = objSink(); TInfoSinkBase& out = objSink();
...@@ -108,16 +67,38 @@ void TOutputGLSL::writeTriplet(Visit visit, const char* preStr, const char* inSt ...@@ -108,16 +67,38 @@ void TOutputGLSL::writeTriplet(Visit visit, const char* preStr, const char* inSt
void TOutputGLSL::visitSymbol(TIntermSymbol* node) void TOutputGLSL::visitSymbol(TIntermSymbol* node)
{ {
TInfoSinkBase& out = objSink(); TInfoSinkBase& out = objSink();
if (writeFullSymbol) const TType& type = node->getType();
if (mWriteFullSymbol)
{ {
TQualifier qualifier = node->getQualifier(); TQualifier qualifier = node->getQualifier();
if ((qualifier != EvqTemporary) && (qualifier != EvqGlobal)) if ((qualifier != EvqTemporary) && (qualifier != EvqGlobal))
out << node->getQualifierString() << " "; out << node->getQualifierString() << " ";
out << getTypeName(node->getType()) << " "; // Declare the struct if we have not done so already.
if ((type.getBasicType() == EbtStruct) && (mDeclaredStructs.find(type.getTypeName()) == mDeclaredStructs.end()))
{
out << "struct " << type.getTypeName() << "{\n";
const TTypeList* structure = type.getStruct();
ASSERT(structure != NULL);
for (size_t i = 0; i < structure->size(); ++i)
{
const TType* fieldType = (*structure)[i].type;
ASSERT(fieldType != NULL);
out << getTypeName(*fieldType) << " " << fieldType->getFieldName() << ";\n";
}
out << "} ";
mDeclaredStructs.insert(type.getTypeName());
}
else
{
out << getTypeName(type) << " ";
}
} }
out << node->getSymbol(); out << node->getSymbol();
if (writeFullSymbol && node->getType().isArray())
if (mWriteFullSymbol && node->getType().isArray())
{ {
out << "[" << node->getType().getArraySize() << "]"; out << "[" << node->getType().getArraySize() << "]";
} }
...@@ -127,11 +108,13 @@ void TOutputGLSL::visitConstantUnion(TIntermConstantUnion* node) ...@@ -127,11 +108,13 @@ void TOutputGLSL::visitConstantUnion(TIntermConstantUnion* node)
{ {
TInfoSinkBase& out = objSink(); TInfoSinkBase& out = objSink();
TType type = node->getType(); const TType& type = node->getType();
int size = type.getObjectSize(); int size = type.getObjectSize();
if (size > 1) bool writeType = (size > 1) || (type.getBasicType() == EbtStruct);
if (writeType)
out << getTypeName(type) << "("; out << getTypeName(type) << "(";
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i)
{
const constUnion& data = node->getUnionArrayPointer()[i]; const constUnion& data = node->getUnionArrayPointer()[i];
switch (data.getType()) switch (data.getType())
{ {
...@@ -143,7 +126,7 @@ void TOutputGLSL::visitConstantUnion(TIntermConstantUnion* node) ...@@ -143,7 +126,7 @@ void TOutputGLSL::visitConstantUnion(TIntermConstantUnion* node)
if (i != size - 1) if (i != size - 1)
out << ", "; out << ", ";
} }
if (size > 1) if (writeType)
out << ")"; out << ")";
} }
...@@ -157,7 +140,7 @@ bool TOutputGLSL::visitBinary(Visit visit, TIntermBinary* node) ...@@ -157,7 +140,7 @@ bool TOutputGLSL::visitBinary(Visit visit, TIntermBinary* node)
case EOpInitialize: case EOpInitialize:
if (visit == InVisit) { if (visit == InVisit) {
out << " = "; out << " = ";
writeFullSymbol= false; mWriteFullSymbol= false;
} }
break; break;
case EOpAddAssign: writeTriplet(visit, NULL, " += ", NULL); break; case EOpAddAssign: writeTriplet(visit, NULL, " += ", NULL); break;
...@@ -255,12 +238,39 @@ bool TOutputGLSL::visitUnary(Visit visit, TIntermUnary* node) ...@@ -255,12 +238,39 @@ bool TOutputGLSL::visitUnary(Visit visit, TIntermUnary* node)
case EOpPreIncrement: writeTriplet(visit, "(++", NULL, ")"); break; case EOpPreIncrement: writeTriplet(visit, "(++", NULL, ")"); break;
case EOpPreDecrement: writeTriplet(visit, "(--", NULL, ")"); break; case EOpPreDecrement: writeTriplet(visit, "(--", NULL, ")"); break;
case EOpConvIntToBool: writeTriplet(visit, "bool(", NULL, ")"); break; case EOpConvIntToBool:
case EOpConvFloatToBool: writeTriplet(visit, "bool(", NULL, ")"); break; case EOpConvFloatToBool:
case EOpConvBoolToFloat: writeTriplet(visit, "float(", NULL, ")"); break; switch (node->getOperand()->getType().getNominalSize())
case EOpConvIntToFloat: writeTriplet(visit, "float(", NULL, ")"); break; {
case EOpConvFloatToInt: writeTriplet(visit, "int(", NULL, ")"); break; case 1: writeTriplet(visit, "bool(", NULL, ")"); break;
case EOpConvBoolToInt: writeTriplet(visit, "int(", NULL, ")"); break; case 2: writeTriplet(visit, "bvec2(", NULL, ")"); break;
case 3: writeTriplet(visit, "bvec3(", NULL, ")"); break;
case 4: writeTriplet(visit, "bvec4(", NULL, ")"); break;
default: UNREACHABLE();
}
break;
case EOpConvBoolToFloat:
case EOpConvIntToFloat:
switch (node->getOperand()->getType().getNominalSize())
{
case 1: writeTriplet(visit, "float(", NULL, ")"); break;
case 2: writeTriplet(visit, "vec2(", NULL, ")"); break;
case 3: writeTriplet(visit, "vec3(", NULL, ")"); break;
case 4: writeTriplet(visit, "vec4(", NULL, ")"); break;
default: UNREACHABLE();
}
break;
case EOpConvFloatToInt:
case EOpConvBoolToInt:
switch (node->getOperand()->getType().getNominalSize())
{
case 1: writeTriplet(visit, "int(", NULL, ")"); break;
case 2: writeTriplet(visit, "ivec2(", NULL, ")"); break;
case 3: writeTriplet(visit, "ivec3(", NULL, ")"); break;
case 4: writeTriplet(visit, "ivec4(", NULL, ")"); break;
default: UNREACHABLE();
}
break;
case EOpRadians: writeTriplet(visit, "radians(", NULL, ")"); break; case EOpRadians: writeTriplet(visit, "radians(", NULL, ")"); break;
case EOpDegrees: writeTriplet(visit, "degrees(", NULL, ")"); break; case EOpDegrees: writeTriplet(visit, "degrees(", NULL, ")"); break;
...@@ -321,13 +331,13 @@ bool TOutputGLSL::visitSelection(Visit visit, TIntermSelection* node) ...@@ -321,13 +331,13 @@ bool TOutputGLSL::visitSelection(Visit visit, TIntermSelection* node)
{ {
node->getTrueBlock()->traverse(this); node->getTrueBlock()->traverse(this);
} }
out << getIndentationString(depth - 2) << "}"; out << "}";
if (node->getFalseBlock()) if (node->getFalseBlock())
{ {
out << " else {\n"; out << " else {\n";
node->getFalseBlock()->traverse(this); node->getFalseBlock()->traverse(this);
out << getIndentationString(depth - 2) << "}"; out << "}";
} }
decrementDepth(); decrementDepth();
out << "\n"; out << "\n";
...@@ -341,19 +351,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -341,19 +351,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
switch (node->getOp()) switch (node->getOp())
{ {
case EOpSequence: case EOpSequence:
if (visit == PreVisit) writeTriplet(visit, NULL, ";\n", ";\n");
{
out << getIndentationString(depth);
}
else if (visit == InVisit)
{
out << ";\n";
out << getIndentationString(depth - 1);
}
else
{
out << ";\n";
}
break; break;
case EOpPrototype: case EOpPrototype:
// Function declaration. // Function declaration.
...@@ -361,7 +359,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -361,7 +359,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
{ {
TString returnType = getTypeName(node->getType()); TString returnType = getTypeName(node->getType());
out << returnType << " " << node->getName() << "("; out << returnType << " " << node->getName() << "(";
writeFullSymbol = true; mWriteFullSymbol = true;
} }
else if (visit == InVisit) else if (visit == InVisit)
{ {
...@@ -372,7 +370,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -372,7 +370,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
{ {
// Called after fucntion arguments. // Called after fucntion arguments.
out << ")"; out << ")";
writeFullSymbol = false; mWriteFullSymbol = false;
} }
break; break;
case EOpFunction: case EOpFunction:
...@@ -416,7 +414,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -416,7 +414,7 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
if (visit == PreVisit) if (visit == PreVisit)
{ {
out << "("; out << "(";
writeFullSymbol = true; mWriteFullSymbol = true;
} }
else if (visit == InVisit) else if (visit == InVisit)
{ {
...@@ -425,23 +423,23 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -425,23 +423,23 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
else else
{ {
out << ")"; out << ")";
writeFullSymbol = false; mWriteFullSymbol = false;
} }
break; break;
case EOpDeclaration: case EOpDeclaration:
// Variable declaration. // Variable declaration.
if (visit == PreVisit) if (visit == PreVisit)
{ {
writeFullSymbol = true; mWriteFullSymbol = true;
} }
else if (visit == InVisit) else if (visit == InVisit)
{ {
out << ", "; out << ", ";
writeFullSymbol = false; mWriteFullSymbol = false;
} }
else else
{ {
writeFullSymbol = false; mWriteFullSymbol = false;
} }
break; break;
...@@ -460,7 +458,22 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node) ...@@ -460,7 +458,22 @@ bool TOutputGLSL::visitAggregate(Visit visit, TIntermAggregate* node)
case EOpConstructMat2: writeTriplet(visit, "mat2(", ", ", ")"); break; case EOpConstructMat2: writeTriplet(visit, "mat2(", ", ", ")"); break;
case EOpConstructMat3: writeTriplet(visit, "mat3(", ", ", ")"); break; case EOpConstructMat3: writeTriplet(visit, "mat3(", ", ", ")"); break;
case EOpConstructMat4: writeTriplet(visit, "mat4(", ", ", ")"); break; case EOpConstructMat4: writeTriplet(visit, "mat4(", ", ", ")"); break;
case EOpConstructStruct: UNIMPLEMENTED(); break; case EOpConstructStruct:
if (visit == PreVisit)
{
const TType& type = node->getType();
ASSERT(type.getBasicType() == EbtStruct);
out << type.getTypeName() << "(";
}
else if (visit == InVisit)
{
out << ", ";
}
else
{
out << ")";
}
break;
case EOpLessThan: writeTriplet(visit, "lessThan(", ", ", ")"); break; case EOpLessThan: writeTriplet(visit, "lessThan(", ", ", ")"); break;
case EOpGreaterThan: writeTriplet(visit, "greaterThan(", ", ", ")"); break; case EOpGreaterThan: writeTriplet(visit, "greaterThan(", ", ", ")"); break;
...@@ -549,7 +562,7 @@ bool TOutputGLSL::visitBranch(Visit visit, TIntermBranch* node) ...@@ -549,7 +562,7 @@ bool TOutputGLSL::visitBranch(Visit visit, TIntermBranch* node)
case EOpKill: writeTriplet(visit, "discard", NULL, NULL); break; case EOpKill: writeTriplet(visit, "discard", NULL, NULL); break;
case EOpBreak: writeTriplet(visit, "break", NULL, NULL); break; case EOpBreak: writeTriplet(visit, "break", NULL, NULL); break;
case EOpContinue: writeTriplet(visit, "continue", NULL, NULL); break; case EOpContinue: writeTriplet(visit, "continue", NULL, NULL); break;
case EOpReturn: writeTriplet(visit, "return", NULL, NULL); break; case EOpReturn: writeTriplet(visit, "return ", NULL, NULL); break;
default: UNREACHABLE(); break; default: UNREACHABLE(); break;
} }
......
src/compiler/OutputGLSL.h
...@@ -13,12 +13,10 @@ ...@@ -13,12 +13,10 @@
class TOutputGLSL : public TIntermTraverser class TOutputGLSL : public TIntermTraverser
{ {
public: public:
TOutputGLSL(TParseContext &context); TOutputGLSL(TInfoSinkBase& objSink);
void header();
protected: protected:
TInfoSinkBase& objSink() { return parseContext.infoSink.obj; } TInfoSinkBase& objSink() { return mObjSink; }
void writeTriplet(Visit visit, const char* preStr, const char* inStr, const char* postStr); void writeTriplet(Visit visit, const char* preStr, const char* inStr, const char* postStr);
virtual void visitSymbol(TIntermSymbol* node); virtual void visitSymbol(TIntermSymbol* node);
...@@ -31,8 +29,14 @@ protected: ...@@ -31,8 +29,14 @@ protected:
virtual bool visitBranch(Visit visit, TIntermBranch* node); virtual bool visitBranch(Visit visit, TIntermBranch* node);
private: private:
bool writeFullSymbol; TInfoSinkBase& mObjSink;
TParseContext &parseContext; bool mWriteFullSymbol;
// Structs are declared as the tree is traversed. This set contains all
// the structs already declared. It is maintained so that a struct is
// declared only once.
typedef std::set<TString> DeclaredStructs;
DeclaredStructs mDeclaredStructs;
}; };
#endif // CROSSCOMPILERGLSL_OUTPUTGLSL_H_ #endif // CROSSCOMPILERGLSL_OUTPUTGLSL_H_
src/compiler/TranslatorGLSL.cpp
...@@ -14,10 +14,8 @@ TranslatorGLSL::TranslatorGLSL(EShLanguage l, int dOptions) ...@@ -14,10 +14,8 @@ TranslatorGLSL::TranslatorGLSL(EShLanguage l, int dOptions)
} }
bool TranslatorGLSL::compile(TIntermNode* root) { bool TranslatorGLSL::compile(TIntermNode* root) {
TParseContext& parseContext = *GetGlobalParseContext(); TOutputGLSL outputGLSL(infoSink.obj);
TOutputGLSL outputGLSL(parseContext); root->traverse(&outputGLSL);
outputGLSL.header();
parseContext.treeRoot->traverse(&outputGLSL);
return true; return true;
} }
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