fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vtn: Use sized types for nir_tex_instr::dest_type

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7989>
This commit is contained in:
Connor Abbott 2020-12-08 13:46:35 +01:00
parent d5e54c6edb
commit 6af5181f13
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/compiler/spirv/spirv_to_nir.c
View file

@ -2613,22 +2613,22 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
case SpvOpImageQuerySizeLod:
case SpvOpImageQuerySize:
texop = nir_texop_txs;
dest_type = nir_type_int;
dest_type = nir_type_int32;
break;
case SpvOpImageQueryLod:
texop = nir_texop_lod;
dest_type = nir_type_float;
dest_type = nir_type_float32;
break;
case SpvOpImageQueryLevels:
texop = nir_texop_query_levels;
dest_type = nir_type_int;
dest_type = nir_type_int32;
break;
case SpvOpImageQuerySamples:
texop = nir_texop_texture_samples;
dest_type = nir_type_int;
dest_type = nir_type_int32;
break;
case SpvOpFragmentFetchAMD:
@ -2637,7 +2637,7 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
case SpvOpFragmentMaskFetchAMD:
texop = nir_texop_fragment_mask_fetch;
dest_type = nir_type_uint;
dest_type = nir_type_uint32;
break;
default:
@ -2941,14 +2941,7 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
vtn_fail_if(sampler_base != ret_base && sampler_base != GLSL_TYPE_VOID,
"SPIR-V return type mismatches image type. This is only valid "
"for untyped images (OpenCL).");
switch (ret_base) {
case GLSL_TYPE_FLOAT: dest_type = nir_type_float; break;
case GLSL_TYPE_INT: dest_type = nir_type_int; break;
case GLSL_TYPE_UINT: dest_type = nir_type_uint; break;
case GLSL_TYPE_BOOL: dest_type = nir_type_bool; break;
default:
vtn_fail("Invalid base type for sampler result");
}
dest_type = nir_get_nir_type_for_glsl_base_type(ret_base);
}
instr->dest_type = dest_type;