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, 2 insertions, 11 deletions

diff --git a/gfx/angle/src/compiler/translator/OutputESSL.cpp b/gfx/angle/src/compiler/translator/OutputESSL.cpp
index e55d6c544..77e0a8fb3 100755
--- a/gfx/angle/src/compiler/translator/OutputESSL.cpp
+++ b/gfx/angle/src/compiler/translator/OutputESSL.cpp
@@ -6,27 +6,20 @@
 
 #include "compiler/translator/OutputESSL.h"
 
-namespace sh
-{
-
 TOutputESSL::TOutputESSL(TInfoSinkBase &objSink,
                          ShArrayIndexClampingStrategy clampingStrategy,
                          ShHashFunction64 hashFunction,
                          NameMap &nameMap,
                          TSymbolTable &symbolTable,
-                         sh::GLenum shaderType,
                          int shaderVersion,
-                         bool forceHighp,
-                         ShCompileOptions compileOptions)
+                         bool forceHighp)
     : TOutputGLSLBase(objSink,
                       clampingStrategy,
                       hashFunction,
                       nameMap,
                       symbolTable,
-                      shaderType,
                       shaderVersion,
-                      SH_ESSL_OUTPUT,
-                      compileOptions),
+                      SH_ESSL_OUTPUT),
       mForceHighp(forceHighp)
 {
 }
@@ -43,5 +36,3 @@ bool TOutputESSL::writeVariablePrecision(TPrecision precision)
         out << getPrecisionString(precision);
     return true;
 }
-
-}  // namespace sh