Support usampler throughout the compiler.

include/GLSLANG/ShaderLang.h

@@ -37,7 +37,7 @@ extern "C" {
 
 // Version number for shader translation API.
 // It is incremented every time the API changes.
-#define ANGLE_SH_VERSION 116
+#define ANGLE_SH_VERSION 117
 
 //
 // The names of the following enums have been derived by replacing GL prefix
@@ -118,6 +118,8 @@ typedef enum {
   SH_SAMPLER_EXTERNAL_OES = 0x8D66,
   SH_INT_SAMPLER_2D     = 0x8DCA,
   SH_INT_SAMPLER_CUBE   = 0x8DCC,
+  SH_UNSIGNED_INT_SAMPLER_2D     = 0x8DD2,
+  SH_UNSIGNED_INT_SAMPLER_CUBE   = 0x8DD4,
 } ShDataType;
 
 typedef enum {

src/compiler/BaseTypes.h

@@ -71,6 +71,8 @@ inline const char* getBasicString(TBasicType t)
     case EbtSampler2DRect:     return "sampler2DRect";     break;
     case EbtISampler2D:        return "isampler2D";        break;
     case EbtISamplerCube:      return "isamplerCube";      break;
+    case EbtUSampler2D:        return "usampler2D";        break;
+    case EbtUSamplerCube:      return "usamplerCube";      break;
     case EbtStruct:            return "structure";         break;
     case EbtInterfaceBlock:    return "interface block";   break;
     default:                   return "unknown type";

src/compiler/SymbolTable.cpp

@@ -52,6 +52,8 @@ void TType::buildMangledName(TString& mangledName)
     case EbtSamplerCube:        mangledName += "sC";     break;
     case EbtISampler2D:         mangledName += "is2";    break;
     case EbtISamplerCube:       mangledName += "isC";    break;
+    case EbtUSampler2D:         mangledName += "us2";    break;
+    case EbtUSamplerCube:       mangledName += "usC";    break;
     case EbtStruct:
         mangledName += "struct-";
         if (typeName)

src/compiler/VariableInfo.cpp

@@ -101,6 +101,8 @@ static ShDataType getVariableDataType(const TType& type)
       case EbtSampler2DRect: return SH_SAMPLER_2D_RECT_ARB;
       case EbtISampler2D: return SH_INT_SAMPLER_2D;
       case EbtISamplerCube: return SH_INT_SAMPLER_CUBE;
+      case EbtUSampler2D: return SH_UNSIGNED_INT_SAMPLER_2D;
+      case EbtUSamplerCube: return SH_UNSIGNED_INT_SAMPLER_CUBE;
       default: UNREACHABLE();
     }
     return SH_NONE;