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

anv/pipeline: Convert lower_input_attachments to deref instructions

Browse Source 
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-22 22:15:51 -07:00
parent 5cd7324a57
commit 38f1b89805
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/intel/vulkan/anv_nir_lower_input_attachments.c
View File

@@ -43,10 +43,10 @@ load_frag_coord(nir_builder *b)
static void static void
try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) 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 = enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(deref->type);
glsl_without_array(load->variables[0]->var->type);
enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(image_type);
if (image_dim != GLSL_SAMPLER_DIM_SUBPASS && if (image_dim != GLSL_SAMPLER_DIM_SUBPASS &&
image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS) image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS)
return; return;
@@ -58,7 +58,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load)
b.cursor = nir_before_instr(&load->instr); b.cursor = nir_before_instr(&load->instr);
nir_ssa_def *frag_coord = nir_f2i32(&b, load_frag_coord(&b)); 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 *pos = nir_iadd(&b, frag_coord, offset);
nir_ssa_def *layer = 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_ssa_def *coord =
nir_vec3(&b, nir_channel(&b, pos, 0), nir_channel(&b, pos, 1), layer); 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; 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: case GLSL_TYPE_FLOAT:
tex->dest_type = nir_type_float; tex->dest_type = nir_type_float;
break; break;
@@ -86,22 +86,23 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load)
tex->is_array = true; tex->is_array = true;
tex->is_shadow = false; tex->is_shadow = false;
tex->texture = nir_deref_var_clone(load->variables[0], tex);
tex->sampler = NULL;
tex->texture_index = 0; tex->texture_index = 0;
tex->sampler_index = 0; tex->sampler_index = 0;
tex->src[0].src_type = nir_tex_src_coord; tex->src[0].src_type = nir_tex_src_texture_deref;
tex->src[0].src = nir_src_for_ssa(coord); 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->coord_components = 3;
tex->src[1].src_type = nir_tex_src_lod; tex->src[2].src_type = nir_tex_src_lod;
tex->src[1].src = nir_src_for_ssa(nir_imm_int(&b, 0)); tex->src[2].src = nir_src_for_ssa(nir_imm_int(&b, 0));
if (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS) { if (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS) {
tex->op = nir_texop_txf_ms; tex->op = nir_texop_txf_ms;
tex->src[2].src_type = nir_tex_src_ms_index; tex->src[3].src_type = nir_tex_src_ms_index;
tex->src[2].src = load->src[1]; tex->src[3].src = load->src[2];
} }
nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); 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); 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; continue;
try_lower_input_load(function->impl, load); try_lower_input_load(function->impl, load);

6
src/intel/vulkan/anv_pipeline.c
View File

@@ -218,12 +218,12 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline,
nir = brw_preprocess_nir(compiler, nir); nir = brw_preprocess_nir(compiler, nir);
NIR_PASS_V(nir, nir_lower_deref_instrs,
nir_lower_texture_derefs | nir_lower_image_derefs);
if (stage == MESA_SHADER_FRAGMENT) if (stage == MESA_SHADER_FRAGMENT)
NIR_PASS_V(nir, anv_nir_lower_input_attachments); NIR_PASS_V(nir, anv_nir_lower_input_attachments);
NIR_PASS_V(nir, nir_lower_deref_instrs,
nir_lower_texture_derefs | nir_lower_image_derefs);
return nir; return nir;
} }