Added support for EXT_frag_depth

include/GLSLANG/ShaderLang.h

@@ -242,6 +242,7 @@ typedef struct
     int OES_EGL_image_external;
     int ARB_texture_rectangle;
     int EXT_draw_buffers;
+    int EXT_frag_depth;
 
     // Set to 1 if highp precision is supported in the fragment language.
     // Default is 0.

src/compiler/BaseTypes.h

@@ -134,6 +134,7 @@ enum TQualifier
     // built-ins written by fragment shader
     EvqFragColor,
     EvqFragData,
+    EvqFragDepth,
 
     // GLSL ES 3.0 vertex output and fragment input
     EvqSmooth,        // Incomplete qualifier, smooth is the default
@@ -215,6 +216,7 @@ inline const char* getQualifierString(TQualifier q)
     case EvqFrontFacing:    return "FrontFacing";    break;
     case EvqFragColor:      return "FragColor";      break;
     case EvqFragData:       return "FragData";       break;
+    case EvqFragDepth:      return "FragDepth";      break;
     case EvqSmoothOut:      return "smooth out";     break;
     case EvqCentroidOut:    return "centroid out";   break;
     case EvqFlatOut:        return "flat out";       break;

src/compiler/Initialize.cpp

@@ -511,6 +511,10 @@ void IdentifyBuiltIns(ShShaderType type, ShShaderSpec spec,
         if (spec != SH_CSS_SHADERS_SPEC) {
             symbolTable.insert(ESSL1_BUILTINS, *new TVariable(NewPoolTString("gl_FragColor"), TType(EbtFloat, EbpMedium, EvqFragColor,   4)));
             symbolTable.insert(ESSL1_BUILTINS, *new TVariable(NewPoolTString("gl_FragData[gl_MaxDrawBuffers]"), TType(EbtFloat, EbpMedium, EvqFragData,    4)));
+            if (resources.EXT_frag_depth) {
+                symbolTable.insert(ESSL1_BUILTINS, *new TVariable(NewPoolTString("gl_FragDepthEXT"), TType(EbtFloat, resources.FragmentPrecisionHigh ? EbpHigh : EbpMedium, EvqFragDepth, 1)));
+                symbolTable.relateToExtension(ESSL1_BUILTINS, "gl_FragDepthEXT", "GL_EXT_frag_depth");
+            }
         } else {
             symbolTable.insert(ESSL1_BUILTINS, *new TVariable(NewPoolTString("css_MixColor"), TType(EbtFloat, EbpMedium, EvqGlobal,      4)));
             symbolTable.insert(ESSL1_BUILTINS, *new TVariable(NewPoolTString("css_ColorMatrix"), TType(EbtFloat, EbpMedium, EvqGlobal,      4, 4)));
@@ -631,4 +635,6 @@ void InitExtensionBehavior(const ShBuiltInResources& resources,
         extBehavior["GL_ARB_texture_rectangle"] = EBhUndefined;
     if (resources.EXT_draw_buffers)
         extBehavior["GL_EXT_draw_buffers"] = EBhUndefined;
+    if (resources.EXT_frag_depth)
+        extBehavior["GL_EXT_frag_depth"] = EBhUndefined;
 }

src/compiler/OutputGLSL.cpp

@@ -19,3 +19,17 @@ bool TOutputGLSL::writeVariablePrecision(TPrecision)
 {
     return false;
 }
+
+void TOutputGLSL::visitSymbol(TIntermSymbol* node)
+{
+    TInfoSinkBase& out = objSink();
+
+    if (node->getSymbol() == "gl_FragDepthEXT")
+    {
+        out << "gl_FragDepth";
+    }
+    else
+    {
+        TOutputGLSLBase::visitSymbol(node);
+    }
+}

src/compiler/OutputGLSL.h

@@ -20,6 +20,7 @@ public:
 
 protected:
     virtual bool writeVariablePrecision(TPrecision);
+    virtual bool visitSymbol(TIntermSymbol* node);
 };
 
 #endif  // CROSSCOMPILERGLSL_OUTPUTGLSL_H_

src/compiler/OutputHLSL.cpp

@@ -97,6 +97,7 @@ OutputHLSL::OutputHLSL(TParseContext &context, const ShBuiltInResources& resourc
     mUsesPointCoord = false;
     mUsesFrontFacing = false;
     mUsesPointSize = false;
+    mUsesFragDepth = false;
     mUsesXor = false;
     mUsesMod1 = false;
     mUsesMod2v = false;
@@ -702,6 +703,11 @@ void OutputHLSL::header()
             out << "};\n";
         }
 
+        if (mUsesFragDepth)
+        {
+            out << "static float gl_Depth = 0.0;\n";
+        }
+
         if (mUsesFragCoord)
         {
             out << "static float4 gl_FragCoord = float4(0, 0, 0, 0);\n";
@@ -1101,6 +1107,11 @@ void OutputHLSL::header()
         out << "#define GL_USES_POINT_SIZE\n";
     }
 
+    if (mUsesFragDepth)
+    {
+        out << "#define GL_USES_FRAG_DEPTH\n";
+    }
+
     if (mUsesDepthRange)
     {
         out << "#define GL_USES_DEPTH_RANGE\n";
@@ -1515,6 +1526,11 @@ void OutputHLSL::visitSymbol(TIntermSymbol *node)
             mUsesPointSize = true;
             out << name;
         }
+        else if (name == "gl_FragDepthEXT")
+        {
+            mUsesFragDepth = true;
+            out << "gl_Depth";
+        }
         else
         {
             out << decorate(name);

src/compiler/OutputHLSL.h

@@ -125,6 +125,7 @@ class OutputHLSL : public TIntermTraverser
     bool mUsesPointCoord;
     bool mUsesFrontFacing;
     bool mUsesPointSize;
+    bool mUsesFragDepth;
     bool mUsesXor;
     bool mUsesMod1;
     bool mUsesMod2v;

src/compiler/ParseHelper.cpp

@@ -1013,6 +1013,22 @@ const TFunction* TParseContext::findFunction(const TSourceLoc& line, TFunction*
     return static_cast<const TFunction*>(symbol);
 }
 
+bool TParseContext::isVariableBuiltIn(const TVariable* var)
+{
+    // First find by unmangled name to check whether the function name has been
+    // hidden by a variable name or struct typename.
+    const TSymbol* symbol = symbolTable.findBuiltIn(var->getName(), shaderVersion);
+    if (symbol == 0) {
+        symbol = symbolTable.findBuiltIn(var->getMangledName(), shaderVersion);
+    }
+
+    if (symbol == 0) {
+        return false;
+    }
+
+    return symbol->isVariable();
+}
+
 //
 // Initializers show up in several places in the grammar.  Have one set of
 // code to handle them here.

src/compiler/ParseHelper.h

@@ -117,6 +117,7 @@ struct TParseContext {
     bool containsSampler(TType& type);
     bool areAllChildConst(TIntermAggregate* aggrNode);
     const TFunction* findFunction(const TSourceLoc& line, TFunction* pfnCall, int shaderVersion, bool *builtIn = 0);
+    bool isVariableBuiltIn(const TVariable* var);
     bool executeInitializer(const TSourceLoc& line, const TString& identifier, TPublicType& pType,
                             TIntermTyped* initializer, TIntermNode*& intermNode, TVariable* variable = 0);
 

src/compiler/ShaderLang.cpp

@@ -127,6 +127,7 @@ void ShInitBuiltInResources(ShBuiltInResources* resources)
     resources->OES_EGL_image_external = 0;
     resources->ARB_texture_rectangle = 0;
     resources->EXT_draw_buffers = 0;
+    resources->EXT_frag_depth = 0;
 
     // Disable highp precision in fragment shader by default.
     resources->FragmentPrecisionHigh = 0;

src/compiler/SymbolTable.cpp

@@ -225,10 +225,9 @@ void TSymbolTableLevel::relateToOperator(const char* name, TOperator op)
 void TSymbolTableLevel::relateToExtension(const char* name, const TString& ext)
 {
     for (tLevel::iterator it = level.begin(); it != level.end(); ++it) {
-        if (it->second->isFunction()) {
-            TFunction* function = static_cast<TFunction*>(it->second);
-            if (function->getName() == name)
-                function->relateToExtension(ext);
+        TSymbol* symbol = it->second;
+        if (symbol->getName() == name) {
+            symbol->relateToExtension(ext);
         }
     }
 }

src/compiler/SymbolTable.h

@@ -50,12 +50,15 @@ public:
     virtual bool isVariable() const { return false; }
     void setUniqueId(int id) { uniqueId = id; }
     int getUniqueId() const { return uniqueId; }
+    void relateToExtension(const TString& ext) { extension = ext; }
+    const TString& getExtension() const { return extension; }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(TSymbol);
 
     const TString *name;
     unsigned int uniqueId;      // For real comparing during code generation
+    TString extension;
 };
 
 //
@@ -153,9 +156,6 @@ public:
     void relateToOperator(TOperator o) { op = o; }
     TOperator getBuiltInOp() const { return op; }
 
-    void relateToExtension(const TString& ext) { extension = ext; }
-    const TString& getExtension() const { return extension; }
-
     void setDefined() { defined = true; }
     bool isDefined() { return defined; }
 
@@ -170,7 +170,6 @@ private:
     TType returnType;
     TString mangledName;
     TOperator op;
-    TString extension;
     bool defined;
 };
 

src/compiler/glslang.y

@@ -224,6 +224,12 @@ variable_identifier
                 context->recover();
             }
             variable = static_cast<const TVariable*>(symbol);
+
+            if (context->isVariableBuiltIn(variable) &&
+                !variable->getExtension().empty() &&
+                context->extensionErrorCheck(@1, variable->getExtension())) {
+                context->recover();
+            }
         }
 
         // don't delete $1.string, it's used by error recovery, and the pool

src/compiler/glslang_tab.cpp

-/* A Bison parser, made by GNU Bison 2.7.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7"
+#define YYBISON_VERSION "2.7.12-4996"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -448,6 +448,14 @@ typedef short int yytype_int16;
 # endif
 #endif
 
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+#  define __attribute__(Spec) /* empty */
+# endif
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -455,6 +463,7 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
+
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
 # define YYID(N) (N)
@@ -781,31 +790,31 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   205,   205,   206,   209,   244,   247,   252,   257,   262,
-     267,   273,   276,   279,   282,   285,   295,   308,   316,   416,
-     419,   427,   430,   436,   440,   447,   453,   462,   470,   473,
-     483,   486,   496,   506,   527,   528,   529,   534,   535,   543,
-     554,   555,   563,   574,   578,   579,   589,   599,   609,   622,
-     623,   633,   646,   650,   654,   658,   659,   672,   673,   686,
-     687,   700,   701,   718,   719,   732,   733,   734,   735,   736,
-     740,   743,   754,   762,   770,   797,   802,   813,   817,   821,
-     825,   832,   869,   872,   879,   887,   908,   929,   939,   967,
-     972,   982,   987,   997,  1000,  1003,  1006,  1012,  1019,  1022,
-    1026,  1030,  1034,  1041,  1045,  1049,  1056,  1060,  1064,  1085,
-    1094,  1100,  1103,  1109,  1115,  1122,  1131,  1140,  1143,  1179,
-    1186,  1190,  1197,  1200,  1204,  1208,  1217,  1226,  1234,  1244,
-    1251,  1254,  1257,  1263,  1270,  1273,  1279,  1282,  1285,  1291,
-    1294,  1309,  1313,  1317,  1321,  1325,  1329,  1334,  1339,  1344,
-    1349,  1354,  1359,  1364,  1369,  1374,  1379,  1384,  1389,  1394,
-    1399,  1404,  1409,  1414,  1419,  1424,  1429,  1434,  1438,  1442,
-    1446,  1450,  1454,  1458,  1462,  1466,  1470,  1474,  1478,  1482,
-    1490,  1498,  1502,  1515,  1515,  1518,  1518,  1524,  1527,  1542,
-    1545,  1554,  1558,  1564,  1571,  1586,  1590,  1594,  1595,  1601,
-    1602,  1603,  1604,  1605,  1609,  1610,  1610,  1610,  1620,  1621,
-    1625,  1625,  1626,  1626,  1631,  1634,  1644,  1647,  1653,  1654,
-    1658,  1666,  1670,  1680,  1685,  1702,  1702,  1707,  1707,  1714,
-    1714,  1722,  1725,  1731,  1734,  1740,  1744,  1751,  1758,  1765,
-    1772,  1783,  1792,  1796,  1803,  1806,  1812,  1812
+       0,   205,   205,   206,   209,   250,   253,   258,   263,   268,
+     273,   279,   282,   285,   288,   291,   301,   314,   322,   422,
+     425,   433,   436,   442,   446,   453,   459,   468,   476,   479,
+     489,   492,   502,   512,   533,   534,   535,   540,   541,   549,
+     560,   561,   569,   580,   584,   585,   595,   605,   615,   628,
+     629,   639,   652,   656,   660,   664,   665,   678,   679,   692,
+     693,   706,   707,   724,   725,   738,   739,   740,   741,   742,
+     746,   749,   760,   768,   776,   803,   808,   819,   823,   827,
+     831,   838,   875,   878,   885,   893,   914,   935,   945,   973,
+     978,   988,   993,  1003,  1006,  1009,  1012,  1018,  1025,  1028,
+    1032,  1036,  1040,  1047,  1051,  1055,  1062,  1066,  1070,  1091,
+    1100,  1106,  1109,  1115,  1121,  1128,  1137,  1146,  1149,  1185,
+    1192,  1196,  1203,  1206,  1210,  1214,  1223,  1232,  1240,  1250,
+    1257,  1260,  1263,  1269,  1276,  1279,  1285,  1288,  1291,  1297,
+    1300,  1315,  1319,  1323,  1327,  1331,  1335,  1340,  1345,  1350,
+    1355,  1360,  1365,  1370,  1375,  1380,  1385,  1390,  1395,  1400,
+    1405,  1410,  1415,  1420,  1425,  1430,  1435,  1440,  1444,  1448,
+    1452,  1456,  1460,  1464,  1468,  1472,  1476,  1480,  1484,  1488,
+    1496,  1504,  1508,  1521,  1521,  1524,  1524,  1530,  1533,  1548,
+    1551,  1560,  1564,  1570,  1577,  1592,  1596,  1600,  1601,  1607,
+    1608,  1609,  1610,  1611,  1615,  1616,  1616,  1616,  1626,  1627,
+    1631,  1631,  1632,  1632,  1637,  1640,  1650,  1653,  1659,  1660,
+    1664,  1672,  1676,  1686,  1691,  1708,  1708,  1713,  1713,  1720,
+    1720,  1728,  1731,  1737,  1740,  1746,  1750,  1757,  1764,  1771,
+    1778,  1789,  1798,  1802,  1809,  1812,  1818,  1818
 };
 #endif
 
@@ -1789,11 +1798,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, context)
 # else
   YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -2193,12 +2198,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, context)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -2541,6 +2541,12 @@ yyreduce:
                 context->recover();
             }
             variable = static_cast<const TVariable*>(symbol);
+
+            if (context->isVariableBuiltIn(variable) &&
+                !variable->getExtension().empty() &&
+                context->extensionErrorCheck((yylsp[(1) - (1)]), variable->getExtension())) {
+                context->recover();
+            }
         }
 
         // don't delete $1.string, it's used by error recovery, and the pool

src/compiler/glslang_tab.h

-/* A Bison parser, made by GNU Bison 2.7.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Bison interface for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

src/libGLESv2/Context.cpp

@@ -3026,6 +3026,7 @@ void Context::initExtensionString()
         }
 
         mExtensionStringList.push_back("GL_EXT_texture_storage");
+        mExtensionStringList.push_back("GL_EXT_frag_depth");
 
         // ANGLE-specific extensions
         if (supportsDepthTextures())

src/libGLESv2/ProgramBinary.cpp

@@ -1178,6 +1178,7 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, int registers, const Varying
     std::string varyingSemantic = (mUsesPointSize && shaderModel == 3) ? "COLOR" : "TEXCOORD";
     std::string targetSemantic = (shaderModel >= 4) ? "SV_Target" : "COLOR";
     std::string positionSemantic = (shaderModel >= 4) ? "SV_Position" : "POSITION";
+    std::string depthSemantic = (shaderModel >= 4) ? "SV_Depth" : "DEPTH";
 
     std::string varyingHLSL = generateVaryingHLSL(fragmentShader, varyingSemantic);
 
@@ -1407,6 +1408,11 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, int registers, const Varying
         {
             pixelHLSL += "    float4 gl_Color" + str(renderTargetIndex) + " : " + targetSemantic + str(renderTargetIndex) + ";\n";
         }
+
+        if (fragmentShader->mUsesFragDepth)
+        {
+            pixelHLSL += "    float gl_Depth : " + depthSemantic + ";\n";
+        }
     }
     else
     {
@@ -1540,6 +1546,11 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, int registers, const Varying
 
             pixelHLSL += "    output.gl_Color" + str(renderTargetIndex) + " = gl_Color[" + str(sourceColorIndex) + "];\n";
         }
+
+        if (fragmentShader->mUsesFragDepth)
+        {
+            pixelHLSL += "    output.gl_Depth = gl_Depth;\n";
+        }
     }
     else
     {

src/libGLESv2/Shader.cpp

@@ -253,6 +253,7 @@ void Shader::initializeCompiler()
             resources.EXT_draw_buffers = mRenderer->getMaxRenderTargets() > 1;
             // resources.OES_EGL_image_external = mRenderer->getShareHandleSupport() ? 1 : 0; // TODO: commented out until the extension is actually supported.
             resources.FragmentPrecisionHigh = 1;   // Shader Model 2+ always supports FP24 (s16e7) which corresponds to highp
+            resources.EXT_frag_depth = 1; // Shader Model 2+ always supports explicit depth output
             // GLSL ES 3.0 constants
             resources.MaxVertexOutputVectors = mRenderer->getMaxVaryingVectors();
             resources.MaxFragmentInputVectors = mRenderer->getMaxVaryingVectors();
@@ -330,6 +331,7 @@ void Shader::parseVaryings()
         mUsesPointSize = strstr(mHlsl, "GL_USES_POINT_SIZE") != NULL;
         mUsesPointCoord = strstr(mHlsl, "GL_USES_POINT_COORD") != NULL;
         mUsesDepthRange = strstr(mHlsl, "GL_USES_DEPTH_RANGE") != NULL;
+        mUsesFragDepth = strstr(mHlsl, "GL_USES_FRAG_DEPTH") != NULL;
     }
 }
 
@@ -362,6 +364,7 @@ void Shader::uncompile()
     mUsesPointSize = false;
     mUsesPointCoord = false;
     mUsesDepthRange = false;
+    mUsesFragDepth = false;
     mShaderVersion = 100;
 
     mActiveUniforms.clear();

src/libGLESv2/Shader.h

@@ -118,6 +118,7 @@ class Shader
     bool mUsesPointSize;
     bool mUsesPointCoord;
     bool mUsesDepthRange;
+    bool mUsesFragDepth;
     int mShaderVersion;
 
     static void *mFragmentCompiler;