Automatically enable highp in fragment shaders on ESSL3

include/GLSLANG/ShaderLang.h

@@ -266,7 +266,9 @@ typedef struct
     // function. This applies to Tegra K1 devices.
     int NV_draw_buffers;
 
-    // Set to 1 if highp precision is supported in the fragment language.
+    // Set to 1 if highp precision is supported in the ESSL 1.00 version of the
+    // fragment language. Does not affect versions of the language where highp
+    // support is mandatory.
     // Default is 0.
     int FragmentPrecisionHigh;
 

src/compiler/translator/Compiler.cpp

@@ -219,7 +219,7 @@ TIntermNode *TCompiler::compileTreeImpl(const char *const shaderStrings[],
                                shaderType, shaderSpec, compileOptions, true,
                                infoSink, debugShaderPrecision);
 
-    parseContext.setFragmentPrecisionHigh(fragmentPrecisionHigh);
+    parseContext.setFragmentPrecisionHighOnESSL1(fragmentPrecisionHigh);
     SetGlobalParseContext(&parseContext);
 
     // We preserve symbols at the built-in level from compile-to-compile.
@@ -252,6 +252,9 @@ TIntermNode *TCompiler::compileTreeImpl(const char *const shaderStrings[],
         root = parseContext.getTreeRoot();
         root = intermediate.postProcess(root);
 
+        // Highp might have been auto-enabled based on shader version
+        fragmentPrecisionHigh = parseContext.getFragmentPrecisionHigh();
+
         // Disallow expressions deemed too complex.
         if (success && (compileOptions & SH_LIMIT_EXPRESSION_COMPLEXITY))
             success = limitExpressionComplexity(root);

src/compiler/translator/ParseContext.h

@@ -50,7 +50,7 @@ class TParseContext : angle::NonCopyable
           mCurrentFunctionType(nullptr),
           mFunctionReturnsValue(false),
           mChecksPrecisionErrors(checksPrecErrors),
-          mFragmentPrecisionHigh(false),
+          mFragmentPrecisionHighOnESSL1(false),
           mDefaultMatrixPacking(EmpColumnMajor),
           mDefaultBlockStorage(EbsShared),
           mDiagnostics(is),
@@ -81,10 +81,13 @@ class TParseContext : angle::NonCopyable
     TIntermNode *getTreeRoot() const { return mTreeRoot; }
     void setTreeRoot(TIntermNode *treeRoot) { mTreeRoot = treeRoot; }
 
-    bool getFragmentPrecisionHigh() const { return mFragmentPrecisionHigh; }
-    void setFragmentPrecisionHigh(bool fragmentPrecisionHigh)
+    bool getFragmentPrecisionHigh() const
     {
-        mFragmentPrecisionHigh = fragmentPrecisionHigh;
+        return mFragmentPrecisionHighOnESSL1 || mShaderVersion >= 300;
+    }
+    void setFragmentPrecisionHighOnESSL1(bool fragmentPrecisionHigh)
+    {
+        mFragmentPrecisionHighOnESSL1 = fragmentPrecisionHigh;
     }
 
     bool getFunctionReturnsValue() const { return mFunctionReturnsValue; }
@@ -342,7 +345,8 @@ class TParseContext : angle::NonCopyable
     const TType *mCurrentFunctionType;  // the return type of the function that's currently being parsed
     bool mFunctionReturnsValue;  // true if a non-void function has a return
     bool mChecksPrecisionErrors;  // true if an error will be generated when a variable is declared without precision, explicit or implicit.
-    bool mFragmentPrecisionHigh;  // true if highp precision is supported in the fragment language.
+    bool mFragmentPrecisionHighOnESSL1;  // true if highp precision is supported when compiling
+                                         // ESSL1.
     TLayoutMatrixPacking mDefaultMatrixPacking;
     TLayoutBlockStorage mDefaultBlockStorage;
     TString mHashErrMsg;

src/tests/test_utils/compiler_test.cpp

@@ -17,11 +17,6 @@ bool compileTestShader(sh::GLenum type,
                        std::string *translatedCode,
                        std::string *infoLog)
 {
-    if (spec == SH_GLES3_SPEC || spec == SH_WEBGL2_SPEC)
-    {
-        resources->FragmentPrecisionHigh = 1;
-    }
-
     TCompiler *translator = ConstructCompiler(type, spec, output);
     if (!translator->Init(*resources))
     {