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

spirv: Handle MakeTexelAvailable/Visible

Browse source 
Set the memory semantics and scope for later emitting the barrier.
Note the barrier emission code already exist in vtn_handle_image for
the Image atomics.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-09-10 13:16:46 -07:00
parent c649e64edc
commit 129c85c28b
1 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2659,31 +2659,62 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
image.sample = NULL;
break;
case SpvOpImageRead:
case SpvOpImageRead: {
image.image = vtn_value(b, w[3], vtn_value_type_pointer)->pointer;
image.coord = get_image_coord(b, w[4]);
if (count > 5 && (w[5] & SpvImageOperandsSampleMask)) {
vtn_assert(w[5] == SpvImageOperandsSampleMask);
image.sample = vtn_ssa_value(b, w[6])->def;
const SpvImageOperandsMask operands =
count > 5 ? w[5] : SpvImageOperandsMaskNone;
int idx = 6;
if (operands & SpvImageOperandsSampleMask) {
image.sample = vtn_ssa_value(b, w[idx])->def;
idx++;
} else {
image.sample = nir_ssa_undef(&b->nb, 1, 32);
}
break;
case SpvOpImageWrite:
if (operands & SpvImageOperandsMakeTexelVisibleMask) {
vtn_fail_if((operands & SpvImageOperandsNonPrivateTexelMask) == 0,
"MakeTexelVisible requires NonPrivateTexel to also be set.");
semantics = SpvMemorySemanticsMakeVisibleMask;
scope = vtn_constant_uint(b, w[idx]);
idx++;
}
/* TODO: Volatile. */
break;
}
case SpvOpImageWrite: {
image.image = vtn_value(b, w[1], vtn_value_type_pointer)->pointer;
image.coord = get_image_coord(b, w[2]);
/* texel = w[3] */
if (count > 4 && (w[4] & SpvImageOperandsSampleMask)) {
vtn_assert(w[4] == SpvImageOperandsSampleMask);
image.sample = vtn_ssa_value(b, w[5])->def;
const SpvImageOperandsMask operands =
count > 4 ? w[4] : SpvImageOperandsMaskNone;
int idx = 5;
if (operands & SpvImageOperandsSampleMask) {
image.sample = vtn_ssa_value(b, w[idx])->def;
idx++;
} else {
image.sample = nir_ssa_undef(&b->nb, 1, 32);
}
if (operands & SpvImageOperandsMakeTexelAvailableMask) {
vtn_fail_if((operands & SpvImageOperandsNonPrivateTexelMask) == 0,
"MakeTexelAvailable requires NonPrivateTexel to also be set.");
semantics = SpvMemorySemanticsMakeAvailableMask;
scope = vtn_constant_uint(b, w[idx]);
}
/* TODO: Volatile. */
break;
}
default:
vtn_fail_with_opcode("Invalid image opcode", opcode);