1 files changed, 44 insertions, 8 deletions

diff --git a/src/3rdparty/angle/src/compiler/translator/OutputGLSL.cpp b/src/3rdparty/angle/src/compiler/translator/OutputGLSL.cpp
index eb7cbb4ae8..9badf0e2fc 100644
--- a/src/3rdparty/angle/src/compiler/translator/OutputGLSL.cpp
+++ b/src/3rdparty/angle/src/compiler/translator/OutputGLSL.cpp
@@ -11,8 +11,15 @@ TOutputGLSL::TOutputGLSL(TInfoSinkBase& objSink,
                          ShHashFunction64 hashFunction,
                          NameMap& nameMap,
                          TSymbolTable& symbolTable,
-                         int shaderVersion)
-    : TOutputGLSLBase(objSink, clampingStrategy, hashFunction, nameMap, symbolTable, shaderVersion)
+                         int shaderVersion,
+                         ShShaderOutput output)
+    : TOutputGLSLBase(objSink,
+                      clampingStrategy,
+                      hashFunction,
+                      nameMap,
+                      symbolTable,
+                      shaderVersion,
+                      output)
 {
 }
 
@@ -21,21 +28,30 @@ bool TOutputGLSL::writeVariablePrecision(TPrecision)
     return false;
 }
 
-void TOutputGLSL::visitSymbol(TIntermSymbol* node)
+void TOutputGLSL::visitSymbol(TIntermSymbol *node)
 {
     TInfoSinkBase& out = objSink();
 
-    if (node->getSymbol() == "gl_FragDepthEXT")
+    const TString &symbol = node->getSymbol();
+    if (symbol == "gl_FragDepthEXT")
     {
         out << "gl_FragDepth";
     }
+    else if (symbol == "gl_FragColor" && getShaderOutput() == SH_GLSL_CORE_OUTPUT)
+    {
+        out << "webgl_FragColor";
+    }
+    else if (symbol == "gl_FragData" && getShaderOutput() == SH_GLSL_CORE_OUTPUT)
+    {
+        out << "webgl_FragData";
+    }
     else
     {
         TOutputGLSLBase::visitSymbol(node);
     }
 }
 
-TString TOutputGLSL::translateTextureFunction(TString& name)
+TString TOutputGLSL::translateTextureFunction(TString &name)
 {
     static const char *simpleRename[] = {
         "texture2DLodEXT", "texture2DLod",
@@ -46,10 +62,30 @@ TString TOutputGLSL::translateTextureFunction(TString& name)
         "textureCubeGradEXT", "textureCubeGradARB",
         NULL, NULL
     };
+    static const char *legacyToCoreRename[] = {
+        "texture2D", "texture",
+        "texture2DProj", "textureProj",
+        "texture2DLod", "textureLod",
+        "texture2DProjLod", "textureProjLod",
+        "textureCube", "texture",
+        "textureCubeLod", "textureLod",
+        // Extensions
+        "texture2DLodEXT", "textureLod",
+        "texture2DProjLodEXT", "textureProjLod",
+        "textureCubeLodEXT", "textureLod",
+        "texture2DGradEXT", "textureGrad",
+        "texture2DProjGradEXT", "textureProjGrad",
+        "textureCubeGradEXT", "textureGrad",
+        NULL, NULL
+    };
+    const char **mapping = (getShaderOutput() == SH_GLSL_CORE_OUTPUT) ?
+        legacyToCoreRename : simpleRename;
 
-    for (int i = 0; simpleRename[i] != NULL; i += 2) {
-        if (name == simpleRename[i]) {
-            return simpleRename[i+1];
+    for (int i = 0; mapping[i] != NULL; i += 2)
+    {
+        if (name == mapping[i])
+        {
+            return mapping[i+1];
         }
     }