merged in angleproject code as od 8.21.13

CONTRIBUTORS

@@ -39,6 +39,7 @@ Google Inc.
  Adrienne Walker
  [email protected]
  Justin Schuh
+ Scott Graham
 
 Adobe Systems Inc.
  Alexandru Chiculita

include/GLSLANG/ShaderLang.h

@@ -109,9 +109,10 @@ typedef enum {
 } ShDataType;
 
 typedef enum {
-  SH_PRECISION_HIGHP    = 0x5001,
-  SH_PRECISION_MEDIUMP  = 0x5002,
-  SH_PRECISION_LOWP     = 0x5003
+  SH_PRECISION_HIGHP     = 0x5001,
+  SH_PRECISION_MEDIUMP   = 0x5002,
+  SH_PRECISION_LOWP      = 0x5003,
+  SH_PRECISION_UNDEFINED = 0
 } ShPrecisionType;
 
 typedef enum {

src/common/version.h

@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 2
 #define BUILD_VERSION 0
-#define BUILD_REVISION 2438
+#define BUILD_REVISION 2440
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/Compiler.cpp

@@ -231,6 +231,11 @@ bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
     floatingPoint.matrix = false;
     floatingPoint.array = false;
 
+    TPublicType sampler;
+    sampler.size = 1;
+    sampler.matrix = false;
+    sampler.array = false;
+
     switch(shaderType)
     {
       case SH_FRAGMENT_SHADER:
@@ -242,6 +247,13 @@ bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
         break;
       default: assert(false && "Language not supported");
     }
+    // We set defaults for all the sampler types, even those that are
+    // only available if an extension exists.
+    for (int samplerType = EbtGuardSamplerBegin + 1;
+         samplerType < EbtGuardSamplerEnd; ++samplerType) {
+        sampler.type = static_cast<TBasicType>(samplerType);
+        symbolTable.setDefaultPrecision(sampler, EbpLow);
+    }
 
     InsertBuiltInFunctions(shaderType, shaderSpec, resources, symbolTable);
 

src/compiler/ShaderLang.cpp

@@ -284,7 +284,9 @@ void ShGetVariableInfo(const ShHandle handle,
         *precision = SH_PRECISION_HIGHP;
         break;
     default:
-        ASSERT(false);
+        // Some types does not support precision, for example, boolean.
+        *precision = SH_PRECISION_UNDEFINED;
+        break;
     }
 
     // This size must match that queried by

src/compiler/SymbolTable.h

@@ -337,10 +337,8 @@ class TSymbolTable {
     void dump(TInfoSink &infoSink) const;
 
     bool setDefaultPrecision(const TPublicType& type, TPrecision prec) {
-        if (IsSampler(type.type))
-            return true;  // Skip sampler types for the time being
-        if (type.type != EbtFloat && type.type != EbtInt)
-            return false; // Only set default precision for int/float
+        if (!supportsPrecision(type.type))
+            return false;
         if (type.size != 1 || type.matrix || type.array)
             return false; // Not allowed to set for aggregate types
         int indexOfLastElement = static_cast<int>(precisionStack.size()) - 1;
@@ -350,9 +348,8 @@ class TSymbolTable {
 
     // Searches down the precisionStack for a precision qualifier for the specified TBasicType
     TPrecision getDefaultPrecision(TBasicType type) {
-        if (type != EbtFloat && type != EbtInt)
+        if (!supportsPrecision(type))
             return EbpUndefined;
-
         int level = static_cast<int>(precisionStack.size()) - 1;
         assert(level >= 0); // Just to be safe. Should not happen.
         PrecisionStackLevel::iterator it;
@@ -371,6 +368,11 @@ class TSymbolTable {
 private:
     int currentLevel() const { return static_cast<int>(table.size()) - 1; }
 
+    bool supportsPrecision(TBasicType type) {
+      // Only supports precision for int, float, and sampler types.
+      return type == EbtFloat || type == EbtInt || IsSampler(type);
+    }
+
     int uniqueId;     // for unique identification in code generation
     std::vector<TSymbolTableLevel*> table;
     typedef TMap<TBasicType, TPrecision> PrecisionStackLevel;

src/compiler/glslang.l

@@ -288,6 +288,11 @@ int reserved_word(yyscan_t yyscanner) {
     return 0;
 }
 
+void yyerror(YYLTYPE* lloc, TParseContext* context, const char* reason) {
+    context->error(*lloc, reason, yyget_text(context->scanner));
+    context->recover();
+}
+
 int glslang_initialize(TParseContext* context) {
     yyscan_t scanner = NULL;
     if (yylex_init_extra(context, &scanner))
@@ -316,6 +321,7 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
     // Initialize preprocessor.
     if (!context->preprocessor.init(count, string, length))
         return 1;
+    context->preprocessor.setMaxTokenLength(SH_MAX_TOKEN_LENGTH);
 
     // Define extension macros.
     const TExtensionBehavior& extBehavior = context->extensionBehavior();