From 13d900de0dcf7885972100f2ad36a6bc5cc0eeb1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 14 Mar 2022 09:45:28 -0400 Subject: [PATCH] llvmpipe: set nir_shader_compiler_options::use_scoped_barrier required for vk memory model Reviewed-by: Dave Airlie Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_nir.c | 1 + src/gallium/drivers/llvmpipe/lp_screen.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 876cc762bf4..a536573b63c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -1907,6 +1907,7 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, visit_shared_atomic(bld_base, instr, result); break; case nir_intrinsic_control_barrier: + case nir_intrinsic_scoped_barrier: visit_barrier(bld_base); break; case nir_intrinsic_group_memory_barrier: diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index aeea451cf6d..d3ae26e0bd4 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -628,6 +628,7 @@ static const struct nir_shader_compiler_options gallivm_nir_options = { .lower_device_index_to_zero = true, .support_16bit_alu = true, .lower_fisnormal = true, + .use_scoped_barrier = true, }; static char *