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
2013-02-21 02:18:42 +00:00 · 2013-02-21 02:18:42 +00:00 · e141d5c99c
commit e141d5c99c
parent e396a22632
7 changed files with 311 additions and 196 deletions
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@ -347,14 +347,7 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
    //
    switch (node->getBasicType()) {
    case EbtVoid:
-    case EbtSampler1D:
-    case EbtSampler2D:
-    case EbtSampler3D:
-    case EbtSamplerCube:
-    case EbtSampler1DShadow:
-    case EbtSampler2DShadow:
-    case EbtSamplerRect:        // ARB_texture_rectangle
-    case EbtSamplerRectShadow:  // ARB_texture_rectangle
+    case EbtSampler:
        return 0;
    default: break;
    }