OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv: Fail when parsing invalid Initializers

Browse Source 
Fail when parsing Initializers used in Variables with Storage Classes
that doesn't support it.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8820>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-02-01 23:19:13 -08:00
parent e41b0202c9
commit 1e59cdbf77
1 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/compiler/spirv/vtn_variables.c
View File

@@ -1977,8 +1977,8 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
} }
if (initializer) { if (initializer) {
switch (var->mode) { switch (storage_class) {
case vtn_variable_mode_workgroup: case SpvStorageClassWorkgroup:
/* VK_KHR_zero_initialize_workgroup_memory. */ /* VK_KHR_zero_initialize_workgroup_memory. */
vtn_fail_if(b->options->environment != NIR_SPIRV_VULKAN, vtn_fail_if(b->options->environment != NIR_SPIRV_VULKAN,
"Only Vulkan supports variable initializer " "Only Vulkan supports variable initializer "
@@ -1992,9 +1992,57 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
vtn_id_for_value(b, initializer)); vtn_id_for_value(b, initializer));
b->shader->info.cs.zero_initialize_shared_memory = true; b->shader->info.cs.zero_initialize_shared_memory = true;
break; break;
default:
/* Nothing to check. */ case SpvStorageClassUniformConstant:
vtn_fail_if(b->options->environment != NIR_SPIRV_OPENGL &&
b->options->environment != NIR_SPIRV_OPENCL,
"Only OpenGL and OpenCL support variable initializer "
"for UniformConstant variable %u\n",
vtn_id_for_value(b, val));
vtn_fail_if(initializer->value_type != vtn_value_type_constant,
"UniformConstant variable %u can only have a constant "
"initializer, but have %u instead",
vtn_id_for_value(b, val),
vtn_id_for_value(b, initializer));
break; break;
case SpvStorageClassOutput:
case SpvStorageClassPrivate:
vtn_assert(b->options->environment != NIR_SPIRV_OPENCL);
/* These can have any initializer. */
break;
case SpvStorageClassFunction:
/* These can have any initializer. */
break;
case SpvStorageClassCrossWorkgroup:
vtn_assert(b->options->environment == NIR_SPIRV_OPENCL);
vtn_fail("Initializer for CrossWorkgroup variable %u "
"not yet supported in Mesa.",
vtn_id_for_value(b, val));
break;
default: {
const enum nir_spirv_execution_environment env =
b->options->environment;
const char *env_name =
env == NIR_SPIRV_VULKAN ? "Vulkan" :
env == NIR_SPIRV_OPENCL ? "OpenCL" :
env == NIR_SPIRV_OPENGL ? "OpenGL" :
NULL;
vtn_assert(env_name);
vtn_fail("In %s, any OpVariable with an Initializer operand "
"must have %s%s%s, or Function as "
"its Storage Class operand. Variable %u has an "
"Initializer but its Storage Class is %s.",
env_name,
env == NIR_SPIRV_VULKAN ? "Private, Output, Workgroup" : "",
env == NIR_SPIRV_OPENCL ? "CrossWorkgroup, UniformConstant" : "",
env == NIR_SPIRV_OPENGL ? "Private, Output, UniformConstant" : "",
vtn_id_for_value(b, val),
spirv_storageclass_to_string(storage_class));
}
} }
switch (initializer->value_type) { switch (initializer->value_type) {