From d5e54c6edb8e60b038a3bb50df5b7d6f5391e27e Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 8 Dec 2020 13:46:17 +0100 Subject: [PATCH] glsl/nir: Use sized types for nir_tex_instr::dest_type Reviewed-by: Jason Ekstrand Part-of: --- src/compiler/glsl/glsl_to_nir.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index aa4082c6764..8e2e4a0ed1e 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -2425,29 +2425,7 @@ nir_visitor::visit(ir_texture *ir) instr->is_shadow = ir->sampler->type->sampler_shadow; if (instr->is_shadow) instr->is_new_style_shadow = (ir->type->vector_elements == 1); - switch (ir->type->base_type) { - case GLSL_TYPE_FLOAT: - instr->dest_type = nir_type_float; - break; - case GLSL_TYPE_FLOAT16: - instr->dest_type = nir_type_float16; - break; - case GLSL_TYPE_INT16: - instr->dest_type = nir_type_int16; - break; - case GLSL_TYPE_UINT16: - instr->dest_type = nir_type_uint16; - break; - case GLSL_TYPE_INT: - instr->dest_type = nir_type_int; - break; - case GLSL_TYPE_BOOL: - case GLSL_TYPE_UINT: - instr->dest_type = nir_type_uint; - break; - default: - unreachable("not reached"); - } + instr->dest_type = nir_get_nir_type_for_glsl_type(ir->type); nir_deref_instr *sampler_deref = evaluate_deref(ir->sampler);