fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 07:40:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler/spirv: expand_to_vec4 -> nir_pad_vec4

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10821>
This commit is contained in:
Mike Blumenkrantz 2021-05-16 10:16:41 -04:00 • committed by Marge Bot
parent 0f8fef1261
commit 1199d86b2c
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3091,29 +3091,12 @@ fill_common_atomic_sources(struct vtn_builder *b, SpvOp opcode,
}
}
static nir_ssa_def *
expand_to_vec4(nir_builder *b, nir_ssa_def *value)
{
nir_ssa_def *components[4];
if (value->num_components == 4)
return value;
nir_ssa_def *undef = nir_ssa_undef(b, 1, value->bit_size);
for (unsigned i = 0; i < 4; i++) {
if (i < value->num_components)
components[i] = nir_channel(b, value, i);
else
components[i] = undef;
}
return nir_vec(b, components, 4);
}
static nir_ssa_def *
get_image_coord(struct vtn_builder *b, uint32_t value)
{
nir_ssa_def *coord = vtn_get_nir_ssa(b, value);
/* The image_load_store intrinsics assume a 4-dim coordinate */
return expand_to_vec4(&b->nb, coord);
return nir_pad_vec4(&b->nb, coord);
}
static void
@ -3337,7 +3320,7 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
/* The image coordinate is always 4 components but we may not have that
* many. Swizzle to compensate.
*/
intrin->src[1] = nir_src_for_ssa(expand_to_vec4(&b->nb, image.coord));
intrin->src[1] = nir_src_for_ssa(nir_pad_vec4(&b->nb, image.coord));
intrin->src[2] = nir_src_for_ssa(image.sample);
break;
}
@ -3387,7 +3370,7 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
/* nir_intrinsic_image_deref_store always takes a vec4 value */
assert(op == nir_intrinsic_image_deref_store);
intrin->num_components = 4;
intrin->src[3] = nir_src_for_ssa(expand_to_vec4(&b->nb, value->def));
intrin->src[3] = nir_src_for_ssa(nir_pad_vec4(&b->nb, value->def));
/* Only OpImageWrite can support a lod parameter if
* SPV_AMD_shader_image_load_store_lod is used but the current NIR
* intrinsics definition for atomics requires us to set it for