commit 5524db0c05c8df6002489a077b18dd6fd5746448
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:38:16 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:38:16 2013 +0000
tree c9192900eb89a6a5600064c46efe0679ab1e2b1f
parent 0bbed38f417d490604909de5928d725fb39c5e3c

Add support for new ESSL 3.00 keywords.

TRAC #22715
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

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

src/compiler/DirectiveHandler.cpp

diff --git a/src/compiler/DirectiveHandler.cpp b/src/compiler/DirectiveHandler.cpp
index 85eac8c..64749f3 100644
--- a/src/compiler/DirectiveHandler.cpp
+++ b/src/compiler/DirectiveHandler.cpp
@@ -26,9 +26,11 @@
 }
 
 TDirectiveHandler::TDirectiveHandler(TExtensionBehavior& extBehavior,
-                                     TDiagnostics& diagnostics)
+                                     TDiagnostics& diagnostics,
+                                     int& shaderVersion)
     : mExtensionBehavior(extBehavior),
-      mDiagnostics(diagnostics)
+      mDiagnostics(diagnostics),
+      mShaderVersion(shaderVersion)
 {
 }
 
@@ -151,7 +153,7 @@
     if (version == 100 ||
         version == 300)
     {
-        mDiagnostics.setShaderVersion(version);
+        mShaderVersion = version;
     }
     else
     {