commit 2ffe0bbe348de5da098616fa6c73b8c002ee1a93
author Nicolas Capens <nicolas@transgaming.com> Mon Jun 24 15:56:19 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:12 2013 -0400
tree b10f142d94d3037e7ad870a0d4a2dbf4352620ce
parent 9e3a3f43967a81cfd3a4e6adb84ddf49a3f9a3b0

Support usampler throughout the compiler.

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

src/compiler/BaseTypes.h

diff --git a/src/compiler/BaseTypes.h b/src/compiler/BaseTypes.h
index 77d9c54..347ae04 100644
--- a/src/compiler/BaseTypes.h
+++ b/src/compiler/BaseTypes.h
@@ -71,6 +71,8 @@
     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

diff --git a/src/compiler/SymbolTable.cpp b/src/compiler/SymbolTable.cpp
index 300c509..4a38447 100644
--- a/src/compiler/SymbolTable.cpp
+++ b/src/compiler/SymbolTable.cpp
@@ -52,6 +52,8 @@
     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

diff --git a/src/compiler/VariableInfo.cpp b/src/compiler/VariableInfo.cpp
index e6163bd..a8dd472 100644
--- a/src/compiler/VariableInfo.cpp
+++ b/src/compiler/VariableInfo.cpp
@@ -101,6 +101,8 @@
       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;