diff options
| author | Jason Ekstrand <[email protected]> | 2017-12-05 22:51:53 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-12-11 22:28:34 -0800 |
| commit | 6737b1b859aadad64e5fe04a92d196a672413e06 (patch) | |
| tree | 9a42cd9366aff4e631bdeabe1ffb0d41fbaa5b33 | |
| parent | bb1e6ff161c9a438243392ca2cbebac781293658 (diff) | |
spirv: Add basic type validation for OpLoad, OpStore, and OpCopyMemory
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 745269b6500..2a413a4caeb 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1974,6 +1974,9 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, struct vtn_value *dest = vtn_value(b, w[1], vtn_value_type_pointer); struct vtn_value *src = vtn_value(b, w[2], vtn_value_type_pointer); + vtn_fail_if(dest->type->deref != src->type->deref, + "Dereferenced pointer types to OpCopyMemory do not match"); + vtn_variable_copy(b, dest->pointer, src->pointer); break; } @@ -1981,8 +1984,11 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, case SpvOpLoad: { struct vtn_type *res_type = vtn_value(b, w[1], vtn_value_type_type)->type; - struct vtn_pointer *src = - vtn_value(b, w[3], vtn_value_type_pointer)->pointer; + struct vtn_value *src_val = vtn_value(b, w[3], vtn_value_type_pointer); + struct vtn_pointer *src = src_val->pointer; + + vtn_fail_if(res_type != src_val->type->deref, + "Result and pointer types of OpLoad do not match"); if (src->mode == vtn_variable_mode_image || src->mode == vtn_variable_mode_sampler) { @@ -1995,8 +2001,12 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, } case SpvOpStore: { - struct vtn_pointer *dest = - vtn_value(b, w[1], vtn_value_type_pointer)->pointer; + struct vtn_value *dest_val = vtn_value(b, w[1], vtn_value_type_pointer); + struct vtn_pointer *dest = dest_val->pointer; + struct vtn_value *src_val = vtn_untyped_value(b, w[2]); + + vtn_fail_if(dest_val->type->deref != src_val->type, + "Value and pointer types of OpStore do not match"); if (glsl_type_is_sampler(dest->type->type)) { vtn_warn("OpStore of a sampler detected. Doing on-the-fly copy " |