fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: use non-atomic load/store ops if intrinsic is not actually coherent

Browse source 
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10475>
This commit is contained in:
Mike Blumenkrantz 2021-04-06 14:03:20 -04:00
parent c8dfed0c12
commit 9712cd3186
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -1856,7 +1856,7 @@ emit_load_bo(struct ntv_context *ctx, nir_intrinsic_instr *intr)
bo, indices,
ARRAY_SIZE(indices));
/* load a single value into the constituents array */
if (ssbo)
if (ssbo && nir_intrinsic_access(intr) & ACCESS_COHERENT)
constituents[i] = emit_atomic(ctx, SpvOpAtomicLoad, uint_type, ptr, 0, 0);
else
constituents[i] = spirv_builder_emit_load(&ctx->builder, uint_type, ptr);
@ -2444,7 +2444,10 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr)
ARRAY_SIZE(indices));
if (is_64bit)
component = spirv_builder_emit_composite_extract(&ctx->builder, uint_type, component_split, &j, 1);
spirv_builder_emit_atomic_store(&ctx->builder, ptr, SpvScopeWorkgroup, 0, component);
if (nir_intrinsic_access(intr) & ACCESS_COHERENT)
spirv_builder_emit_atomic_store(&ctx->builder, ptr, SpvScopeWorkgroup, 0, component);
else
spirv_builder_emit_store(&ctx->builder, ptr, component);
}
write_count++;
} else if (is_64bit)