1 files changed, 3 insertions, 33 deletions
diff --git a/gfx/angle/src/libANGLE/renderer/gl/ShaderGL.cpp b/gfx/angle/src/libANGLE/renderer/gl/ShaderGL.cpp
index c9145b00a0..400917b352 100755
--- a/gfx/angle/src/libANGLE/renderer/gl/ShaderGL.cpp
+++ b/gfx/angle/src/libANGLE/renderer/gl/ShaderGL.cpp
@@ -36,8 +36,8 @@ ShaderGL::~ShaderGL()
     }
 }
 
-ShCompileOptions ShaderGL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
-                                                         std::string * /*sourcePath*/)
+int ShaderGL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
+                                            std::string * /*sourcePath*/)
 {
     // Reset the previous state
     if (mShaderID != 0)
@@ -48,43 +48,13 @@ ShCompileOptions ShaderGL::prepareSourceAndReturnOptions(std::stringstream *sour
 
     *sourceStream << mData.getSource();
 
-    ShCompileOptions options = SH_INIT_GL_POSITION;
+    int options = SH_INIT_GL_POSITION;
 
     if (mWorkarounds.doWhileGLSLCausesGPUHang)
     {
         options |= SH_REWRITE_DO_WHILE_LOOPS;
     }
 
-    if (mWorkarounds.emulateAbsIntFunction)
-    {
-        options |= SH_EMULATE_ABS_INT_FUNCTION;
-    }
-
-    if (mWorkarounds.addAndTrueToLoopCondition)
-    {
-        options |= SH_ADD_AND_TRUE_TO_LOOP_CONDITION;
-    }
-
-    if (mWorkarounds.emulateIsnanFloat)
-    {
-        options |= SH_EMULATE_ISNAN_FLOAT_FUNCTION;
-    }
-
-    if (mWorkarounds.useUnusedBlocksWithStandardOrSharedLayout)
-    {
-        options |= SH_USE_UNUSED_STANDARD_SHARED_BLOCKS;
-    }
-
-    if (mWorkarounds.dontRemoveInvariantForFragmentInput)
-    {
-        options |= SH_DONT_REMOVE_INVARIANT_FOR_FRAGMENT_INPUT;
-    }
-
-    if (mWorkarounds.removeInvariantAndCentroidForESSL3)
-    {
-        options |= SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3;
-    }
-
     return options;
 }