From b00b42d99b0fe1e7009858d20bf6e6fc880b8fa7 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Kristensen Date: Wed, 24 Feb 2016 16:10:08 -0800 Subject: nir/spirv: Use the new bare sampler type --- src/compiler/nir/spirv/spirv_to_nir.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/compiler') 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: -- cgit v1.2.3