commit 646ea1ec4b97de7f7f4ad49cd64536269a634cd8
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jun 15 17:36:31 2012 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jun 15 17:36:31 2012 +0000
tree d221e9255d45f208afe9cbba292271f03078bdab
parent 0c1f5942e18a6bee3c2d10526850c397e4a152e3

Fixed compile error for translator_hlsl.

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

src/compiler/Diagnostics.h

diff --git a/src/compiler/Diagnostics.h b/src/compiler/Diagnostics.h
index d27cb91..43a1306 100644
--- a/src/compiler/Diagnostics.h
+++ b/src/compiler/Diagnostics.h
@@ -17,6 +17,8 @@
     TDiagnostics(TInfoSink& infoSink);
     virtual ~TDiagnostics();
 
+    TInfoSink& infoSink() { return mInfoSink; }
+
     void writeInfo(Severity severity,
                    const pp::SourceLocation& loc,
                    const std::string& reason,

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 929da70..7e00cb6 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -101,8 +101,8 @@
     mContext.treeRoot->traverse(this);   // Output the body first to determine what has to go in the header
     header();
 
-    mContext.infoSink.obj << mHeader.c_str();
-    mContext.infoSink.obj << mBody.c_str();
+    mContext.infoSink().obj << mHeader.c_str();
+    mContext.infoSink().obj << mBody.c_str();
 }
 
 TInfoSinkBase &OutputHLSL::getBodyStream()

src/compiler/ParseHelper.h

diff --git a/src/compiler/ParseHelper.h b/src/compiler/ParseHelper.h
index 8fb9057..84203e9 100644
--- a/src/compiler/ParseHelper.h
+++ b/src/compiler/ParseHelper.h
@@ -67,6 +67,7 @@
     bool initPreprocessor();
     void destroyPreprocessor();
 
+    TInfoSink& infoSink() { return diagnostics.infoSink(); }
     void error(TSourceLoc loc, const char *reason, const char* token,
                const char* extraInfoFormat, ...);
     void warning(TSourceLoc loc, const char* reason, const char* token,

src/compiler/TranslatorHLSL.cpp

diff --git a/src/compiler/TranslatorHLSL.cpp b/src/compiler/TranslatorHLSL.cpp
index 96d7f10..f41decd 100644
--- a/src/compiler/TranslatorHLSL.cpp
+++ b/src/compiler/TranslatorHLSL.cpp
@@ -6,6 +6,7 @@
 
 #include "compiler/TranslatorHLSL.h"
 
+#include "compiler/InitializeParseContext.h"
 #include "compiler/OutputHLSL.h"
 
 TranslatorHLSL::TranslatorHLSL(ShShaderType type, ShShaderSpec spec)