diff options
| author | John Kessenich <cepheus@frii.com> | 2013-02-21 02:18:42 +0000 |
|---|---|---|
| committer | John Kessenich <cepheus@frii.com> | 2013-02-21 02:18:42 +0000 |
| commit | e141d5c99c95d06a246d9d5c4f400e2e63598623 (patch) | |
| tree | c0d23f4f6246e0182f6c6ff555931c762d0325db /glslang/MachineIndependent/Intermediate.cpp | |
| parent | e396a22632fc84be0b75f0366e3d35ebda7f1e43 (diff) | |
| download | glslang-e141d5c99c95d06a246d9d5c4f400e2e63598623.tar.gz | |
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
Diffstat (limited to 'glslang/MachineIndependent/Intermediate.cpp')
| -rw-r--r-- | glslang/MachineIndependent/Intermediate.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index 551454c5..8273bf41 100644 --- 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; } |