KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/lower_input_attachments: lower nir_texop_fragment_{mask}_fetch 

These instructions are allowed to fetch from multisampled
subpass input attachments.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3304>
This commit is contained in:
Samuel Pitoiset 2020-01-07 10:01:14 +01:00 committed by Marge Bot
parent 76a34f5d3f
commit 84b08971fb
1 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/compiler/nir/nir_lower_input_attachments.c
View File

@ -126,6 +126,35 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
return true;
}
static bool
try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
bool use_fragcoord_sysval)
{
nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
assert(glsl_type_is_image(deref->type));
if (glsl_get_sampler_dim(deref->type) != GLSL_SAMPLER_DIM_SUBPASS_MS)
return false;
nir_builder b;
nir_builder_init(&b, impl);
b.cursor = nir_before_instr(&tex->instr);
nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
: load_frag_coord(&b);
frag_coord = nir_f2i32(&b, frag_coord);
nir_ssa_def *layer = nir_load_layer_id(&b);
nir_ssa_def *coord = nir_vec3(&b, nir_channel(&b, frag_coord, 0),
nir_channel(&b, frag_coord, 1), layer);
tex->coord_components = 3;
nir_instr_rewrite_src(&tex->instr, &tex->src[1].src, nir_src_for_ssa(coord));
return true;
}
bool
nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
{
@ -138,16 +167,29 @@ nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
switch (instr->type) {
case nir_instr_type_tex: {
nir_tex_instr *tex = nir_instr_as_tex(instr);
nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr);
if (tex->op == nir_texop_fragment_mask_fetch ||
tex->op == nir_texop_fragment_fetch) {
progress |= try_lower_input_texop(function->impl, tex,
use_fragcoord_sysval);
}
break;
}
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr);
if (load->intrinsic != nir_intrinsic_image_deref_load)
continue;
progress |= try_lower_input_load(function->impl, load,
use_fragcoord_sysval);
if (load->intrinsic == nir_intrinsic_image_deref_load) {
progress |= try_lower_input_load(function->impl, load,
use_fragcoord_sysval);
}
break;
}
default:
break;
}
}
}
}