Module: Mesa Branch: main Commit: 8c8e6e953f0ecb2e7e71a2311e5fc76860a57be8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c8e6e953f0ecb2e7e71a2311e5fc76860a57be8
Author: Mike Blumenkrantz <[email protected]> Date: Wed May 11 16:01:48 2022 -0400 spirv: fix barrier scope assert glslang generates barriers with QueueFamily, so this is totally legal cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16462> --- src/compiler/spirv/spirv_to_nir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 5e74c23d73a..635fdda2527 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -4145,8 +4145,8 @@ vtn_emit_memory_barrier(struct vtn_builder *b, SpvScope scope, return; } - /* There's only two scopes thing left */ - vtn_assert(scope == SpvScopeInvocation || scope == SpvScopeDevice); + /* There's only three scopes left */ + vtn_assert(scope == SpvScopeInvocation || scope == SpvScopeDevice || scope == SpvScopeQueueFamily); /* Map the GLSL memoryBarrier() construct and any barriers with more than one * semantic to the corresponding NIR one.
