diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-03-24 17:30:14 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-03-24 17:30:14 -0700 |
| commit | 2c3f95d6aaab38cd66dd3dee1b089d5c91928eea (patch) | |
| tree | 43423daf0da9c45f4054c5763a87f33dbfc7c4d5 /src/intel/vulkan/anv_nir_apply_dynamic_offsets.c | |
| parent | a5dc3c0f02aa523d1d3d123b62b9a187821079fe (diff) | |
| parent | 22b343a8ec75a08dae6a6badbb261eab8437475d (diff) | |
| download | external_mesa3d-2c3f95d6aaab38cd66dd3dee1b089d5c91928eea.zip external_mesa3d-2c3f95d6aaab38cd66dd3dee1b089d5c91928eea.tar.gz external_mesa3d-2c3f95d6aaab38cd66dd3dee1b089d5c91928eea.tar.bz2 | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/intel/vulkan/anv_nir_apply_dynamic_offsets.c')
| -rw-r--r-- | src/intel/vulkan/anv_nir_apply_dynamic_offsets.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c index 46bc5d2..234855c 100644 --- a/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c +++ b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c @@ -85,7 +85,7 @@ apply_dynamic_offsets_block(nir_block *block, void *void_state) offset_load->src[0] = nir_src_for_ssa(nir_imul(b, res_intrin->src[0].ssa, nir_imm_int(b, 8))); - nir_ssa_dest_init(&offset_load->instr, &offset_load->dest, 2, NULL); + nir_ssa_dest_init(&offset_load->instr, &offset_load->dest, 2, 32, NULL); nir_builder_instr_insert(b, &offset_load->instr); nir_src *offset_src = nir_get_io_offset_src(intrin); @@ -107,7 +107,8 @@ apply_dynamic_offsets_block(nir_block *block, void *void_state) /* It's a load, we need a phi node */ nir_phi_instr *phi = nir_phi_instr_create(b->shader); nir_ssa_dest_init(&phi->instr, &phi->dest, - intrin->num_components, NULL); + intrin->num_components, + intrin->dest.ssa.bit_size, NULL); nir_phi_src *src1 = ralloc(phi, nir_phi_src); struct exec_node *tnode = exec_list_get_tail(&if_stmt->then_list); @@ -117,7 +118,7 @@ apply_dynamic_offsets_block(nir_block *block, void *void_state) b->cursor = nir_after_cf_list(&if_stmt->else_list); nir_ssa_def *zero = nir_build_imm(b, intrin->num_components, - (nir_const_value) { .u = { 0, 0, 0, 0 } }); + (nir_const_value) { .u32 = { 0, 0, 0, 0 } }); nir_phi_src *src2 = ralloc(phi, nir_phi_src); struct exec_node *enode = exec_list_get_tail(&if_stmt->else_list); |