commit 354ed2d19ec2a2f3b28db2a7ff3b93f9910a60c0
author Nicolas Capens <nicolas@transgaming.com> Thu Jul 11 11:26:26 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:13 2013 -0400
tree 65d3b9be30a7975e37fe58d0228fa98cfb2cc9a2
parent 8f80e024a4de7a40d5c9162dbb311f2e24daa5e7

Compact sampler type translation.

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

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index dfcc268..9ac5ed4 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -3803,55 +3803,27 @@
         }
         else UNREACHABLE();
     }
-    else if (type.getBasicType() == EbtSampler2D)
+
+    switch(type.getBasicType())
     {
-        return GL_SAMPLER_2D;
+      case EbtSampler2D:            return GL_SAMPLER_2D;
+      case EbtSampler3D:            return GL_SAMPLER_3D;
+      case EbtSamplerCube:          return GL_SAMPLER_CUBE;
+      case EbtSampler2DArray:       return GL_SAMPLER_2D_ARRAY;
+      case EbtISampler2D:           return GL_INT_SAMPLER_2D;
+      case EbtISampler3D:           return GL_INT_SAMPLER_3D;
+      case EbtISamplerCube:         return GL_INT_SAMPLER_CUBE;
+      case EbtISampler2DArray:      return GL_INT_SAMPLER_2D_ARRAY;
+      case EbtUSampler2D:           return GL_UNSIGNED_INT_SAMPLER_2D;
+      case EbtUSampler3D:           return GL_UNSIGNED_INT_SAMPLER_3D;
+      case EbtUSamplerCube:         return GL_UNSIGNED_INT_SAMPLER_CUBE;
+      case EbtUSampler2DArray:      return GL_UNSIGNED_INT_SAMPLER_2D_ARRAY;
+      case EbtSampler2DShadow:      return GL_SAMPLER_2D_SHADOW;
+      case EbtSamplerCubeShadow:    return GL_SAMPLER_CUBE_SHADOW;
+      case EbtSampler2DArrayShadow: return GL_SAMPLER_2D_ARRAY_SHADOW;
+      default: UNREACHABLE();
     }
-    else if (type.getBasicType() == EbtSampler3D)
-    {
-        return GL_SAMPLER_3D;
-    }
-    else if (type.getBasicType() == EbtSamplerCube)
-    {
-        return GL_SAMPLER_CUBE;
-    }
-    else if (type.getBasicType() == EbtSampler2DArray)
-    {
-        return GL_SAMPLER_2D_ARRAY;
-    }
-    else if (type.getBasicType() == EbtISampler2D)
-    {
-        return GL_INT_SAMPLER_2D;
-    }
-    else if (type.getBasicType() == EbtISampler3D)
-    {
-        return GL_INT_SAMPLER_3D;
-    }
-    else if (type.getBasicType() == EbtISamplerCube)
-    {
-        return GL_INT_SAMPLER_CUBE;
-    }
-    else if (type.getBasicType() == EbtISampler2DArray)
-    {
-        return GL_INT_SAMPLER_2D_ARRAY;
-    }
-    else if (type.getBasicType() == EbtUSampler2D)
-    {
-        return GL_UNSIGNED_INT_SAMPLER_2D;
-    }
-    else if (type.getBasicType() == EbtUSampler3D)
-    {
-        return GL_UNSIGNED_INT_SAMPLER_3D;
-    }
-    else if (type.getBasicType() == EbtUSamplerCube)
-    {
-        return GL_UNSIGNED_INT_SAMPLER_CUBE;
-    }
-    else if (type.getBasicType() == EbtUSampler2DArray)
-    {
-        return GL_UNSIGNED_INT_SAMPLER_2D_ARRAY;
-    }
-    else UNREACHABLE();
+
 
     return GL_NONE;
 }