Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 8 insertions, 15 deletions

diff --git a/gfx/angle/src/compiler/translator/OutputESSL.h b/gfx/angle/src/compiler/translator/OutputESSL.h
index 5b2cb9492..c5a963499 100755
--- a/gfx/angle/src/compiler/translator/OutputESSL.h
+++ b/gfx/angle/src/compiler/translator/OutputESSL.h
@@ -9,29 +9,22 @@
 
 #include "compiler/translator/OutputGLSLBase.h"
 
-namespace sh
-{
-
 class TOutputESSL : public TOutputGLSLBase
 {
-  public:
-    TOutputESSL(TInfoSinkBase &objSink,
+public:
+    TOutputESSL(TInfoSinkBase& objSink,
                 ShArrayIndexClampingStrategy clampingStrategy,
                 ShHashFunction64 hashFunction,
-                NameMap &nameMap,
-                TSymbolTable &symbolTable,
-                sh::GLenum shaderType,
+                NameMap& nameMap,
+                TSymbolTable& symbolTable,
                 int shaderVersion,
-                bool forceHighp,
-                ShCompileOptions compileOptions);
+                bool forceHighp);
 
-  protected:
-    bool writeVariablePrecision(TPrecision precision) override;
+protected:
+  bool writeVariablePrecision(TPrecision precision) override;
 
-  private:
+private:
     bool mForceHighp;
 };
 
-}  // namespace sh
-
 #endif  // COMPILER_TRANSLATOR_OUTPUTESSL_H_