Skip to content

A
angle
Commit e78c0c99 by daniel@transgaming.com
Options

Compiler - only declare used HLSL functions

TRAC #11315 Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@75 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 5e417109
Showing with 118 additions and 117 deletions
src/compiler/OutputHLSL.cpp
...@@ -411,6 +411,113 @@ void OutputHLSL::header() ...@@ -411,6 +411,113 @@ void OutputHLSL::header()
"\n"; "\n";
} }
void OutputHLSL::footer()
{
EShLanguage language = context.language;
TInfoSinkBase &out = context.infoSink.obj;
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel();
if (language == EShLangFragment)
{
out << "PS_OUTPUT main(PS_INPUT input)\n" // FIXME: Prevent name clashes
"{\n"
" float rhw = 1.0 / input.gl_FragCoord.w;\n"
" gl_FragCoord.x = (input.gl_FragCoord.x * rhw) * gl_Window.x + gl_Window.z;\n"
" gl_FragCoord.y = (input.gl_FragCoord.y * rhw) * gl_Window.y + gl_Window.w;\n"
" gl_FragCoord.z = (input.gl_FragCoord.z * rhw) * gl_Depth.x + gl_Depth.y;\n"
" gl_FragCoord.w = rhw;\n"
" gl_FrontFacing = __frontCCW ? (input.__vFace >= 0.0) : (input.__vFace <= 0.0);\n";
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
const TType &type = variable->getType();
TQualifier qualifier = type.getQualifier();
if (qualifier == EvqVaryingIn)
{
out << " " + name + " = input." + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
out << "\n"
" gl_main();\n"
"\n"
" PS_OUTPUT output;\n" // FIXME: Prevent name clashes
" output.gl_Color[0] = gl_Color[0];\n"; // FIXME: Prevent name clashes
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel();
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
}
}
else
{
out << "VS_OUTPUT main(VS_INPUT input)\n" // FIXME: Prevent name clashes
"{\n";
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
const TType &type = variable->getType();
TQualifier qualifier = type.getQualifier();
if (qualifier == EvqAttribute)
{
out << " " + name + " = input." + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
out << "\n"
" gl_main();\n"
"\n"
" VS_OUTPUT output;\n" // FIXME: Prevent name clashes
" output.gl_Position.x = gl_Position.x - gl_HalfPixelSize.x * gl_Position.w;\n"
" output.gl_Position.y = -(gl_Position.y - gl_HalfPixelSize.y * gl_Position.w);\n"
" output.gl_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
" output.gl_Position.w = gl_Position.w;\n"
" output.gl_PointSize = gl_PointSize;\n"
" output.gl_FragCoord = gl_Position;\n";
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel();
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
TQualifier qualifier = variable->getType().getQualifier();
if (qualifier == EvqVaryingOut || qualifier == EvqInvariantVaryingOut)
{
out << " output." + name + " = " + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
}
out << " return output;\n" // FIXME: Prevent name clashes
"}\n";
}
void OutputHLSL::visitSymbol(TIntermSymbol *node) void OutputHLSL::visitSymbol(TIntermSymbol *node)
{ {
TInfoSinkBase &out = context.infoSink.obj; TInfoSinkBase &out = context.infoSink.obj;
...@@ -678,67 +785,9 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node) ...@@ -678,67 +785,9 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
{ {
if (name == "main") if (name == "main")
{ {
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel(); name = "gl_main";
if (language == EShLangFragment)
{
out << "PS_OUTPUT main(PS_INPUT input)\n" // FIXME: Prevent name clashes
"{\n"
" float rhw = 1.0 / input.gl_FragCoord.w;\n"
" gl_FragCoord.x = (input.gl_FragCoord.x * rhw) * gl_Window.x + gl_Window.z;\n"
" gl_FragCoord.y = (input.gl_FragCoord.y * rhw) * gl_Window.y + gl_Window.w;\n"
" gl_FragCoord.z = (input.gl_FragCoord.z * rhw) * gl_Depth.x + gl_Depth.y;\n"
" gl_FragCoord.w = rhw;\n"
" gl_FrontFacing = __frontCCW ? (input.__vFace >= 0.0) : (input.__vFace <= 0.0);\n";
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
const TType &type = variable->getType();
TQualifier qualifier = type.getQualifier();
if(qualifier == EvqVaryingIn)
{
out << " " + name + " = input." + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
} }
else
{
out << "VS_OUTPUT main(VS_INPUT input)\n" // FIXME: Prevent name clashes
"{\n";
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
const TType &type = variable->getType();
TQualifier qualifier = type.getQualifier();
if (qualifier == EvqAttribute)
{
out << " " + name + " = input." + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
}
// Erase the (empty) argument list
TIntermSequence &sequence = node->getSequence();
sequence.erase(sequence.begin());
}
else
{
out << typeString(node->getType()) << " " << name << "("; out << typeString(node->getType()) << " " << name << "(";
TIntermSequence &sequence = node->getSequence(); TIntermSequence &sequence = node->getSequence();
...@@ -755,7 +804,7 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node) ...@@ -755,7 +804,7 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
out << typeString(type) + " " + name; out << typeString(type) + " " + name;
if(i < arguments.size() - 1) if (i < arguments.size() - 1)
{ {
out << ", "; out << ", ";
} }
...@@ -768,63 +817,11 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node) ...@@ -768,63 +817,11 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
out << ")\n" out << ")\n"
"{\n"; "{\n";
} }
}
else if (visit == PostVisit) else if (visit == PostVisit)
{ {
if (name == "main")
{
if (language == EShLangFragment)
{
out << " PS_OUTPUT output;\n" // FIXME: Prevent name clashes
" output.gl_Color[0] = gl_Color[0];\n"; // FIXME: Prevent name clashes
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel();
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
}
}
else
{
out << " VS_OUTPUT output;\n" // FIXME: Prevent name clashes
" output.gl_Position.x = gl_Position.x - gl_HalfPixelSize.x * gl_Position.w;\n"
" output.gl_Position.y = -(gl_Position.y - gl_HalfPixelSize.y * gl_Position.w);\n"
" output.gl_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
" output.gl_Position.w = gl_Position.w;\n"
" output.gl_PointSize = 1.0;\n"
" output.gl_FragCoord = gl_Position;\n";
TSymbolTableLevel *symbols = context.symbolTable.getGlobalLevel();
for (TSymbolTableLevel::const_iterator namedSymbol = symbols->begin(); namedSymbol != symbols->end(); namedSymbol++)
{
const TSymbol *symbol = (*namedSymbol).second;
const TString &name = symbol->getName();
if (symbol->isVariable())
{
const TVariable *variable = static_cast<const TVariable*>(symbol);
TQualifier qualifier = variable->getType().getQualifier();
if(qualifier == EvqVaryingOut || qualifier == EvqInvariantVaryingOut)
{
out << " output." + name + " = " + name + ";\n"; // FIXME: Prevent name clashes
}
}
}
}
out << " return output;\n" // FIXME: Prevent name clashes
"}\n";
}
else
{
out << "}\n"; out << "}\n";
} }
} }
}
break; break;
case EOpFunctionCall: case EOpFunctionCall:
{ {
...@@ -944,7 +941,7 @@ bool OutputHLSL::visitSelection(Visit visit, TIntermSelection *node) ...@@ -944,7 +941,7 @@ bool OutputHLSL::visitSelection(Visit visit, TIntermSelection *node)
{ {
TInfoSinkBase &out = context.infoSink.obj; TInfoSinkBase &out = context.infoSink.obj;
if(node->getType().getBasicType() == EbtVoid) // if/else statement if (node->getType().getBasicType() == EbtVoid) // if/else statement
{ {
out << "if("; out << "if(";
......
src/compiler/OutputHLSL.h
...@@ -23,6 +23,7 @@ class OutputHLSL : public TIntermTraverser ...@@ -23,6 +23,7 @@ class OutputHLSL : public TIntermTraverser
OutputHLSL(TParseContext &context); OutputHLSL(TParseContext &context);
void header(); void header();
void footer();
protected: protected:
void visitSymbol(TIntermSymbol*); void visitSymbol(TIntermSymbol*);
......
src/compiler/TranslatorHLSL.cpp
...@@ -7,16 +7,19 @@ ...@@ -7,16 +7,19 @@
#include "TranslatorHLSL.h" #include "TranslatorHLSL.h"
#include "OutputHLSL.h" #include "OutputHLSL.h"
TranslatorHLSL::TranslatorHLSL(EShLanguage l, int dOptions) TranslatorHLSL::TranslatorHLSL(EShLanguage language, int debugOptions)
: TCompiler(l), : TCompiler(language), debugOptions(debugOptions)
debugOptions(dOptions) { {
} }
bool TranslatorHLSL::compile(TIntermNode* root) { bool TranslatorHLSL::compile(TIntermNode *root)
{
TParseContext& parseContext = *GetGlobalParseContext(); TParseContext& parseContext = *GetGlobalParseContext();
sh::OutputHLSL outputHLSL(parseContext); sh::OutputHLSL outputHLSL(parseContext);
outputHLSL.header(); outputHLSL.header();
parseContext.treeRoot->traverse(&outputHLSL); parseContext.treeRoot->traverse(&outputHLSL);
outputHLSL.footer();
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