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

spirv: Add better validation to Op[Spec]Constant

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2017-12-11 22:15:04 -08:00
parent 6cf965751a
commit dabce5061d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/spirv/spirv_to_nir.c
View File

@@ -1300,7 +1300,9 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
} }
case SpvOpConstant: { case SpvOpConstant: {
vtn_assert(glsl_type_is_scalar(val->type->type)); vtn_fail_if(val->type->base_type != vtn_base_type_scalar,
"Result type of %s must be a scalar",
spirv_op_to_string(opcode));
int bit_size = glsl_get_bit_size(val->type->type); int bit_size = glsl_get_bit_size(val->type->type);
switch (bit_size) { switch (bit_size) {
case 64: case 64:
@@ -1317,8 +1319,11 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
} }
break; break;
} }
case SpvOpSpecConstant: { case SpvOpSpecConstant: {
vtn_assert(glsl_type_is_scalar(val->type->type)); vtn_fail_if(val->type->base_type != vtn_base_type_scalar,
"Result type of %s must be a scalar",
spirv_op_to_string(opcode));
int bit_size = glsl_get_bit_size(val->type->type); int bit_size = glsl_get_bit_size(val->type->type);
switch (bit_size) { switch (bit_size) {
case 64: case 64: