diff options
Diffstat (limited to 'src/intel/vulkan/anv_nir_lower_input_attachments.c')
| -rw-r--r-- | src/intel/vulkan/anv_nir_lower_input_attachments.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/intel/vulkan/anv_nir_lower_input_attachments.c b/src/intel/vulkan/anv_nir_lower_input_attachments.c index 6dc4f90853b..81e5ad53eaa 100644 --- a/src/intel/vulkan/anv_nir_lower_input_attachments.c +++ b/src/intel/vulkan/anv_nir_lower_input_attachments.c @@ -43,10 +43,10 @@ load_frag_coord(nir_builder *b) static void try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) { + nir_deref_instr *deref = nir_src_as_deref(load->src[0]); + assert(glsl_type_is_image(deref->type)); - const struct glsl_type *image_type = - glsl_without_array(load->variables[0]->var->type); - enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(image_type); + enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(deref->type); if (image_dim != GLSL_SAMPLER_DIM_SUBPASS && image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS) return; @@ -58,7 +58,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) b.cursor = nir_before_instr(&load->instr); nir_ssa_def *frag_coord = nir_f2i32(&b, load_frag_coord(&b)); - nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[0], 2); + nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2); nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset); nir_ssa_def *layer = @@ -66,11 +66,11 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) nir_ssa_def *coord = nir_vec3(&b, nir_channel(&b, pos, 0), nir_channel(&b, pos, 1), layer); - nir_tex_instr *tex = nir_tex_instr_create(b.shader, 2 + multisampled); + nir_tex_instr *tex = nir_tex_instr_create(b.shader, 3 + multisampled); tex->op = nir_texop_txf; - switch (glsl_get_sampler_result_type(image_type)) { + switch (glsl_get_sampler_result_type(deref->type)) { case GLSL_TYPE_FLOAT: tex->dest_type = nir_type_float; break; @@ -86,22 +86,23 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) tex->is_array = true; tex->is_shadow = false; - tex->texture = nir_deref_var_clone(load->variables[0], tex); - tex->sampler = NULL; tex->texture_index = 0; tex->sampler_index = 0; - tex->src[0].src_type = nir_tex_src_coord; - tex->src[0].src = nir_src_for_ssa(coord); + tex->src[0].src_type = nir_tex_src_texture_deref; + tex->src[0].src = nir_src_for_ssa(&deref->dest.ssa); + + tex->src[1].src_type = nir_tex_src_coord; + tex->src[1].src = nir_src_for_ssa(coord); tex->coord_components = 3; - tex->src[1].src_type = nir_tex_src_lod; - tex->src[1].src = nir_src_for_ssa(nir_imm_int(&b, 0)); + tex->src[2].src_type = nir_tex_src_lod; + tex->src[2].src = nir_src_for_ssa(nir_imm_int(&b, 0)); if (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS) { tex->op = nir_texop_txf_ms; - tex->src[2].src_type = nir_tex_src_ms_index; - tex->src[2].src = load->src[1]; + tex->src[3].src_type = nir_tex_src_ms_index; + tex->src[3].src = load->src[2]; } nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); @@ -127,7 +128,7 @@ anv_nir_lower_input_attachments(nir_shader *shader) nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr); - if (load->intrinsic != nir_intrinsic_image_var_load) + if (load->intrinsic != nir_intrinsic_image_deref_load) continue; try_lower_input_load(function->impl, load); |