diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2016-02-24 16:10:08 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2016-02-28 11:24:05 -0800 |
| commit | b00b42d99b0fe1e7009858d20bf6e6fc880b8fa7 (patch) | |
| tree | 301a6f72133c21b472e96b7aa3659d1c55a97da8 | |
| parent | 72efb68d48082a3da819ca47adc12733a3e8d105 (diff) | |
nir/spirv: Use the new bare sampler type
| -rw-r--r-- | src/compiler/nir/spirv/spirv_to_nir.c | 6 |
1 files changed, 1 insertions, 5 deletions
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: |