commit 05b6b7fcdfe5de1b3b63ad268d100822f0c1a819
author Zhenyao Mo <zmo@chromium.org> Mon Mar 02 17:08:09 2015 -0800
committer Zhenyao Mo <zmo@chromium.org> Tue Mar 03 19:39:36 2015 +0000
tree f8ccc1b62d74e54ac3dbb1b2f9aef8c628f26943
parent 7749005a24fefe65788515a4ff078315a9e3f18d

Add an SH_GLSL_CORE_OUTPUT profile.

So we could generate shaders for Apple using core GL profile.

By switching to core profile, we still pass most WebGL conformance tests 1.0.2 on Linux, but not all, so apparently more work is needed.

However, I think it's OK to check this CL in because this output profile will be only used behind a chromium switch.

BUG=angleproject:933
TEST=webgl conformance tests

Change-Id: Iad70e1aebf82349d3fc5f4116c1d6bc4448193fd
Reviewed-on: https://chromium-review.googlesource.com/255282
Tested-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/OutputGLSL.cpp

diff --git a/src/compiler/translator/OutputGLSL.cpp b/src/compiler/translator/OutputGLSL.cpp
index eb7cbb4..9badf0e 100644
--- a/src/compiler/translator/OutputGLSL.cpp
+++ b/src/compiler/translator/OutputGLSL.cpp
@@ -11,8 +11,15 @@
                          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 @@
     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 @@
         "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];
         }
     }