spirv: Drop the constant_as_global as option

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6379>
This commit is contained in:
Jason Ekstrand
2020-08-19 11:26:53 -05:00
committed by Marge Bot
parent 26a4c8f375
commit 6678f1e81c
4 changed files with 6 additions and 22 deletions

View File

@@ -1803,13 +1803,8 @@ vtn_storage_class_to_mode(struct vtn_builder *b,
break;
case SpvStorageClassUniformConstant:
if (b->shader->info.stage == MESA_SHADER_KERNEL) {
if (b->options->constant_as_global) {
mode = vtn_variable_mode_cross_workgroup;
nir_mode = nir_var_mem_global;
} else {
mode = vtn_variable_mode_constant;
nir_mode = nir_var_mem_constant;
}
mode = vtn_variable_mode_constant;
nir_mode = nir_var_mem_constant;
} else {
mode = vtn_variable_mode_uniform;
nir_mode = nir_var_uniform;