From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Thu, 25 Feb 2016 00:10:08 +0000 (-0800)
Subject: nir/spirv: Use the new bare sampler type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b00b42d99b0fe1e7009858d20bf6e6fc880b8fa7;p=mesa.git

nir/spirv: Use the new bare sampler type
---

diff --git a/src/compiler/nir/spirv/spirv_to_nir.c b/src/compiler/nir/spirv/spirv_to_nir.c
index cb069b93ae8..5a7184acac6 100644
--- a/src/compiler/nir/spirv/spirv_to_nir.c
+++ b/src/compiler/nir/spirv/spirv_to_nir.c
@@ -769,12 +769,8 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
        * thrown away the moment you combine it with an image.  What really
        * matters is that it's a sampler type as opposed to an integer type
        * so the backend knows what to do.
-       *
-       * TODO: Eventually we should consider adding a "bare sampler" type
-       * to glsl_types.
        */
-      val->type->type = glsl_sampler_type(GLSL_SAMPLER_DIM_2D, false, false,
-                                          GLSL_TYPE_FLOAT);
+      val->type->type = glsl_bare_sampler_type();
       break;
 
    case SpvOpTypeOpaque: