Module: Mesa Branch: master Commit: f1f75fda9c1adfcf01a04114effe7d5e60663c33 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1f75fda9c1adfcf01a04114effe7d5e60663c33
Author: Mike Blumenkrantz <[email protected]> Date: Mon Feb 15 13:19:51 2021 -0500 zink: add available|visible masks to all barriers in ntv we shouldn't need to consider whether these get added since we always want them Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9055> --- src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c index 171cd4ee58c..b466382722c 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c @@ -1450,7 +1450,7 @@ spirv_builder_emit_memory_barrier(struct spirv_builder *b, SpvScope scope, SpvMe spirv_buffer_prepare(&b->instructions, b->mem_ctx, 3); spirv_buffer_emit_word(&b->instructions, SpvOpMemoryBarrier | (3 << 16)); spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, scope)); - spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, semantics)); + spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, semantics | SpvMemorySemanticsMakeAvailableMask | SpvMemorySemanticsMakeVisibleMask)); } void @@ -1460,7 +1460,7 @@ spirv_builder_emit_control_barrier(struct spirv_builder *b, SpvScope scope, SpvS spirv_buffer_emit_word(&b->instructions, SpvOpControlBarrier | (4 << 16)); spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, scope)); spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, mem_scope)); - spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, semantics)); + spirv_buffer_emit_word(&b->instructions, spirv_builder_const_uint(b, 32, semantics | SpvMemorySemanticsMakeAvailableMask | SpvMemorySemanticsMakeVisibleMask)); } SpvId _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
