Module: Mesa Branch: master Commit: 24f019fd6911c360f32ebdb474375212706fff62 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=24f019fd6911c360f32ebdb474375212706fff62
Author: Jason Ekstrand <[email protected]> Date: Mon Dec 11 15:31:22 2017 -0800 spirv: Allow ignoring decorations for workgroup variables Since we switched over to lowering SLM access directly in SPIR-V -> NIR, we no longer have vtn_variables for SLM. It's all safe as with UBOs and SSBOs but we need to let it through in the assert. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104213 Fixes: 8761a04d0d9332d9c0c99164faf855fc3c741f7c Reviewed-by: Jordan Justen <[email protected]> --- src/compiler/spirv/vtn_variables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 671f18a033..745269b650 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1533,7 +1533,9 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, */ vtn_assert(vtn_var->mode == vtn_variable_mode_ubo || vtn_var->mode == vtn_variable_mode_ssbo || - vtn_var->mode == vtn_variable_mode_push_constant); + vtn_var->mode == vtn_variable_mode_push_constant || + (vtn_var->mode == vtn_variable_mode_workgroup && + b->options->lower_workgroup_access_to_offsets)); } } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
