diff options
| author | Connor Abbott <[email protected]> | 2015-07-06 14:58:55 -0700 |
|---|---|---|
| committer | Connor Abbott <[email protected]> | 2015-07-06 15:00:37 -0700 |
| commit | f9dbc34a187946331a13475b0d34ecdb161025e7 (patch) | |
| tree | ac2792b5cee017b6162f046ed83764d8b4745d83 | |
| parent | f3ea3b6e58db743097e87216e860f1666590416e (diff) | |
nir/spirv: fix some bugsvulkan-header-0.90.0
| -rw-r--r-- | src/glsl/nir/spirv_to_nir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c index 23b80b12e53..ec26111930a 100644 --- a/src/glsl/nir/spirv_to_nir.c +++ b/src/glsl/nir/spirv_to_nir.c @@ -837,7 +837,7 @@ vtn_builtin_load(struct vtn_builder *b, nir_ssa_dest_init(&load->instr, &load->dest, glsl_get_vector_elements(val->type), NULL); - load->variables[0] = nir_deref_var_create(b->shader, var); + load->variables[0] = nir_deref_var_create(load, var); load->num_components = glsl_get_vector_elements(val->type); nir_builder_instr_insert(&b->nb, &load->instr); val->def = &load->dest.ssa; @@ -855,7 +855,7 @@ vtn_builtin_store(struct vtn_builder *b, nir_intrinsic_instr *store = nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_var); - store->variables[0] = nir_deref_var_create(b->shader, var); + store->variables[0] = nir_deref_var_create(store, var); store->num_components = glsl_get_vector_elements(val->type); store->src[0] = nir_src_for_ssa(val->def); nir_builder_instr_insert(&b->nb, &store->instr); @@ -952,6 +952,7 @@ _vtn_variable_store(struct vtn_builder *b, struct vtn_type *dest_type, nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_var); store->variables[0] = nir_deref_as_var(nir_copy_deref(store, &dest_deref->deref)); + store->num_components = glsl_get_vector_elements(src->type); store->src[0] = nir_src_for_ssa(src->def); nir_builder_instr_insert(&b->nb, &store->instr); @@ -1460,6 +1461,7 @@ create_vec(void *mem_ctx, unsigned num_components) nir_alu_instr *vec = nir_alu_instr_create(mem_ctx, op); nir_ssa_dest_init(&vec->instr, &vec->dest.dest, num_components, NULL); + vec->dest.write_mask = (1 << num_components) - 1; return vec; } @@ -2048,7 +2050,6 @@ vtn_handle_composite(struct vtn_builder *b, SpvOp opcode, break; case SpvOpCompositeConstruct: { - val->ssa = rzalloc(b, struct vtn_ssa_value); unsigned elems = count - 3; if (glsl_type_is_vector_or_scalar(type)) { nir_ssa_def *srcs[4]; |