Added GLSL backend for ESSL translator.
Review URL: http://codereview.appspot.com/698041
git-svn-id: https://angleproject.googlecode.com/svn/trunk@69 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/ShaderLang.cpp
index 2e29d2c..c02a063 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -13,7 +13,6 @@
#include "Initialize.h"
#include "InitializeDll.h"
-#include "OutputHLSL.h"
#include "ParseHelper.h"
#include "ShHandle.h"
#include "SymbolTable.h"
@@ -244,19 +243,20 @@
return 0;
GlobalPoolAllocator.push();
- compiler->infoSink.info.erase();
- compiler->infoSink.debug.erase();
- compiler->infoSink.obj.erase();
+ TInfoSink& infoSink = compiler->infoSink;
+ infoSink.info.erase();
+ infoSink.debug.erase();
+ infoSink.obj.erase();
if (numStrings == 0)
return 1;
- TIntermediate intermediate(compiler->infoSink);
+ TIntermediate intermediate(infoSink);
TSymbolTable symbolTable(SymbolTables[compiler->getLanguage()]);
- GenerateBuiltInSymbolTable(resources, compiler->infoSink, &symbolTable, compiler->getLanguage());
+ GenerateBuiltInSymbolTable(resources, infoSink, &symbolTable, compiler->getLanguage());
- TParseContext parseContext(symbolTable, intermediate, compiler->getLanguage(), compiler->infoSink);
+ TParseContext parseContext(symbolTable, intermediate, compiler->getLanguage(), infoSink);
parseContext.initializeExtensionBehavior();
GlobalParseContext = &parseContext;
@@ -290,18 +290,10 @@
if (debugOptions & EDebugOpIntermediate)
intermediate.outputTree(parseContext.treeRoot);
- if(debugOptions & EDebugOpObjectCode)
- {
- sh::OutputHLSL outputHLSL(parseContext);
-
- outputHLSL.header();
- parseContext.treeRoot->traverse(&outputHLSL);
- }
-
//
// Call the machine dependent compiler
//
- if (! compiler->compile(parseContext.treeRoot))
+ if (!compiler->compile(parseContext.treeRoot))
success = false;
}
}