commit 4888ceb6681c3668d3afcbdafdbe2b7efdaa3d04
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Oct 01 21:13:12 2010 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Oct 01 21:13:12 2010 +0000
tree 1cab32b19f5e7f20e16861af5307d16a8016449a
parent 2fa73694ed9cb7ae617eec7cfb7d33728fe4928f

Made the API of shader translator library consistent.
- We recently started using OpenGL-type enums. This CL makes all old enums consistent with the new scheme.
- Renamed TBuiltInResource to ShBuiltInResources to have a consistent prefix

BUG=46
Review URL: http://codereview.appspot.com/2328041

git-svn-id: https://angleproject.googlecode.com/svn/trunk@443 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/Compiler.cpp

diff --git a/src/compiler/Compiler.cpp b/src/compiler/Compiler.cpp
index c35d928..7e8a835 100644
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/Compiler.cpp
@@ -10,12 +10,12 @@
 
 static bool InitializeSymbolTable(
         const TBuiltInStrings& builtInStrings,
-        EShLanguage language, EShSpec spec, const TBuiltInResource& resources,
+        ShShaderType type, ShShaderSpec spec, const ShBuiltInResources& resources,
         TInfoSink& infoSink, TSymbolTable& symbolTable)
 {
     TIntermediate intermediate(infoSink);
     TExtensionBehavior extBehavior;
-    TParseContext parseContext(symbolTable, extBehavior, intermediate, language, spec, infoSink);
+    TParseContext parseContext(symbolTable, extBehavior, intermediate, type, spec, infoSink);
 
     GlobalParseContext = &parseContext;
 
@@ -53,7 +53,7 @@
         }
     }
 
-    IdentifyBuiltIns(language, spec, resources, symbolTable);
+    IdentifyBuiltIns(type, spec, resources, symbolTable);
 
     FinalizePreprocessor();
 
@@ -68,7 +68,17 @@
     }
 }
 
-bool TCompiler::Init(const TBuiltInResource& resources)
+TCompiler::TCompiler(ShShaderType type, ShShaderSpec spec)
+    : shaderType(type),
+      shaderSpec(spec) 
+{
+}
+
+TCompiler::~TCompiler()
+{
+}
+
+bool TCompiler::Init(const ShBuiltInResources& resources)
 {
     // Generate built-in symbol table.
     if (!InitBuiltInSymbolTable(resources))
@@ -89,7 +99,7 @@
 
     TIntermediate intermediate(infoSink);
     TParseContext parseContext(symbolTable, extensionBehavior, intermediate,
-                               language, spec, infoSink);
+                               shaderType, shaderSpec, infoSink);
     GlobalParseContext = &parseContext;
     setInitialState();
 
@@ -110,13 +120,13 @@
     if (success) {
         success = intermediate.postProcess(parseContext.treeRoot);
 
-        if (success && (compileOptions & EShOptIntermediateTree))
+        if (success && (compileOptions & SH_INTERMEDIATE_TREE))
             intermediate.outputTree(parseContext.treeRoot);
 
-        if (success && (compileOptions & EShOptObjectCode))
+        if (success && (compileOptions & SH_OBJECT_CODE))
             translate(parseContext.treeRoot);
 
-        if (success && (compileOptions & EShOptAttribsUniforms))
+        if (success && (compileOptions & SH_ATTRIBUTES_UNIFORMS))
             collectAttribsUniforms(parseContext.treeRoot);
     }
 
@@ -131,12 +141,13 @@
     return success;
 }
 
-bool TCompiler::InitBuiltInSymbolTable(const TBuiltInResource& resources)
+bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources& resources)
 {
     TBuiltIns builtIns;
 
-    builtIns.initialize(language, spec, resources);
-    return InitializeSymbolTable(builtIns.getBuiltInStrings(), language, spec, resources, infoSink, symbolTable);
+    builtIns.initialize(shaderType, shaderSpec, resources);
+    return InitializeSymbolTable(builtIns.getBuiltInStrings(),
+        shaderType, shaderSpec, resources, infoSink, symbolTable);
 }
 
 void TCompiler::clearResults()