diff options
author | Jason Ekstrand <[email protected]> | 2017-12-11 15:31:22 -0800 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2017-12-11 19:02:47 -0800 |
commit | 24f019fd6911c360f32ebdb474375212706fff62 (patch) | |
tree | 8f71b2adcd2463b2ccab081f01f481a0d7db44ae /src | |
parent | 2bc9123c3358a67b3b12fa6f1e5041b402221a4f (diff) |
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]>
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/spirv/vtn_variables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 671f18a0339..745269b6500 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)); } } } |