Define generic sampler types.

src/compiler/translator/BaseTypes.h

@@ -42,7 +42,8 @@ enum TBasicType
     EbtInt,
     EbtUInt,
     EbtBool,
-    EbtGuardSamplerBegin,  // non type:  see implementation of IsSampler()
+    EbtGVec4,              // non type: represents vec4, ivec4 and uvec4
+    EbtGuardSamplerBegin,  // non type: see implementation of IsSampler()
     EbtSampler2D,
     EbtSampler3D,
     EbtSamplerCube,
@@ -60,7 +61,11 @@ enum TBasicType
     EbtSampler2DShadow,
     EbtSamplerCubeShadow,
     EbtSampler2DArrayShadow,
-    EbtGuardSamplerEnd,    // non type:  see implementation of IsSampler()
+    EbtGuardSamplerEnd,    // non type: see implementation of IsSampler()
+    EbtGSampler2D,         // non type: represents sampler2D, isampler2D and usampler2D
+    EbtGSampler3D,         // non type: represents sampler3D, isampler3D and usampler3D
+    EbtGSamplerCube,       // non type: represents samplerCube, isamplerCube and usamplerCube
+    EbtGSampler2DArray,    // non type: represents sampler2DArray, isampler2DArray and usampler2DArray
     EbtStruct,
     EbtInterfaceBlock,
     EbtAddress,            // should be deprecated??

src/compiler/translator/SymbolTable.h

@@ -293,32 +293,65 @@ public:
         return insert(level, *constant);
     }
 
-    bool insertBuiltIn(ESymbolLevel level, TType *rvalue, const char *name, TType *ptype1, TType *ptype2 = 0, TType *ptype3 = 0, TType *ptype4 = 0)
+    void insertBuiltIn(ESymbolLevel level, TType *rvalue, const char *name, TType *ptype1, TType *ptype2 = 0, TType *ptype3 = 0, TType *ptype4 = 0)
     {
+        if (ptype1->getBasicType() == EbtGSampler2D)
+        {
+            bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtFloat, 4) : rvalue, name, new TType(EbtSampler2D), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtInt, 4) : rvalue, name, new TType(EbtISampler2D), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtUInt, 4) : rvalue, name, new TType(EbtUSampler2D), ptype2, ptype3, ptype4);
+            return;
+        }
+        else if (ptype1->getBasicType() == EbtGSampler3D)
+        {
+            bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtFloat, 4) : rvalue, name, new TType(EbtSampler3D), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtInt, 4) : rvalue, name, new TType(EbtISampler3D), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtUInt, 4) : rvalue, name, new TType(EbtUSampler3D), ptype2, ptype3, ptype4);
+            return;
+        }
+        else if (ptype1->getBasicType() == EbtGSamplerCube)
+        {
+            bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtFloat, 4) : rvalue, name, new TType(EbtSamplerCube), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtInt, 4) : rvalue, name, new TType(EbtISamplerCube), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtUInt, 4) : rvalue, name, new TType(EbtUSamplerCube), ptype2, ptype3, ptype4);
+            return;
+        }
+        else if (ptype1->getBasicType() == EbtGSampler2DArray)
+        {
+            bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtFloat, 4) : rvalue, name, new TType(EbtSampler2DArray), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtInt, 4) : rvalue, name, new TType(EbtISampler2DArray), ptype2, ptype3, ptype4);
+            insertBuiltIn(level, gvec4 ? new TType(EbtUInt, 4) : rvalue, name, new TType(EbtUSampler2DArray), ptype2, ptype3, ptype4);
+            return;
+        }
+
         TFunction *function = new TFunction(NewPoolTString(name), *rvalue);
 
         TParameter param1 = {NULL, ptype1};
         function->addParameter(param1);
 
-        if(ptype2)
+        if (ptype2)
         {
             TParameter param2 = {NULL, ptype2};
             function->addParameter(param2);
         }
 
-        if(ptype3)
+        if (ptype3)
         {
             TParameter param3 = {NULL, ptype3};
             function->addParameter(param3);
         }
 
-        if(ptype4)
+        if (ptype4)
         {
             TParameter param4 = {NULL, ptype4};
             function->addParameter(param4);
         }
 
-        return insert(level, *function);
+        insert(level, *function);
     }
 
     TSymbol *find(const TString &name, int shaderVersion, bool *builtIn = false, bool *sameScope = false);