Support sampler3D throughout the compiler.

TRAC #23365
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

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 117
+#define ANGLE_SH_VERSION 118
 
 //
 // The names of the following enums have been derived by replacing GL prefix
@@ -113,12 +113,15 @@ typedef enum {
   SH_FLOAT_MAT4x2   = 0x8B69,
   SH_FLOAT_MAT4x3   = 0x8B6A,
   SH_SAMPLER_2D     = 0x8B5E,
+  SH_SAMPLER_3D     = 0x8B5F,
   SH_SAMPLER_CUBE   = 0x8B60,
   SH_SAMPLER_2D_RECT_ARB = 0x8B63,
   SH_SAMPLER_EXTERNAL_OES = 0x8D66,
   SH_INT_SAMPLER_2D     = 0x8DCA,
+  SH_INT_SAMPLER_3D     = 0x8DCB,
   SH_INT_SAMPLER_CUBE   = 0x8DCC,
   SH_UNSIGNED_INT_SAMPLER_2D     = 0x8DD2,
+  SH_UNSIGNED_INT_SAMPLER_3D     = 0x8DD3,
   SH_UNSIGNED_INT_SAMPLER_CUBE   = 0x8DD4,
 } ShDataType;
 

src/compiler/BaseTypes.h

@@ -69,12 +69,15 @@ inline const char* getBasicString(TBasicType t)
     case EbtUInt:              return "uint";              break;
     case EbtBool:              return "bool";              break;
     case EbtSampler2D:         return "sampler2D";         break;
+    case EbtSampler3D:         return "sampler3D";         break;
     case EbtSamplerCube:       return "samplerCube";       break;
     case EbtSamplerExternalOES: return "samplerExternalOES"; break;
     case EbtSampler2DRect:     return "sampler2DRect";     break;
     case EbtISampler2D:        return "isampler2D";        break;
+    case EbtISampler3D:        return "isampler3D";        break;
     case EbtISamplerCube:      return "isamplerCube";      break;
     case EbtUSampler2D:        return "usampler2D";        break;
+    case EbtUSampler3D:        return "usampler3D";        break;
     case EbtUSamplerCube:      return "usamplerCube";      break;
     case EbtStruct:            return "structure";         break;
     case EbtInterfaceBlock:    return "interface block";   break;

src/compiler/SymbolTable.cpp

@@ -49,10 +49,13 @@ void TType::buildMangledName(TString& mangledName)
     case EbtUInt:               mangledName += 'u';      break;
     case EbtBool:               mangledName += 'b';      break;
     case EbtSampler2D:          mangledName += "s2";     break;
+    case EbtSampler3D:          mangledName += "s3";     break;
     case EbtSamplerCube:        mangledName += "sC";     break;
     case EbtISampler2D:         mangledName += "is2";    break;
+    case EbtISampler3D:         mangledName += "is3";    break;
     case EbtISamplerCube:       mangledName += "isC";    break;
     case EbtUSampler2D:         mangledName += "us2";    break;
+    case EbtUSampler3D:         mangledName += "us3";    break;
     case EbtUSamplerCube:       mangledName += "usC";    break;
     case EbtStruct:
         mangledName += "struct-";