Replace flat 110 sampler type space with an orthogonalized 430 sampler type space. Invoke it for all the sampler types in the 4.3 grammar.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20652 e7fa87d3-cd2b-0410-9028-fcbf551c1848

glslang/Include/BaseTypes.h

@@ -38,33 +38,20 @@
 #define _BASICTYPES_INCLUDED_
 
 //
-// Basic type.  Arrays, vectors, etc., are orthogonal to this.
+// Basic type.  Arrays, vectors, sampler details, etc., are orthogonal to this.
 //
 enum TBasicType {
     EbtVoid,
     EbtFloat,
     EbtDouble,
     EbtInt,
+    EbtUint,
     EbtBool,
-    EbtGuardSamplerBegin,  // non type:  see implementation of IsSampler()
-    EbtSampler1D,
-    EbtSampler2D,
-    EbtSampler3D,
-    EbtSamplerCube,
-    EbtSampler1DShadow,
-    EbtSampler2DShadow,
-    EbtSamplerRect,        // ARB_texture_rectangle
-    EbtSamplerRectShadow,  // ARB_texture_rectangle
-    EbtGuardSamplerEnd,    // non type:  see implementation of IsSampler()
+    EbtSampler,
     EbtStruct,
     EbtNumTypes
 };
 
-__inline bool IsSampler(TBasicType type)
-{   
-    return type > EbtGuardSamplerBegin && type < EbtGuardSamplerEnd;
-}
-
 //
 // Qualifiers and built-ins.  These are mainly used to see what can be read
 // or written, and by the machine dependent translator to know which registers