#include "nir_builder.h"
static nir_ssa_def *
-load_frag_coord(nir_builder *b)
+load_frag_coord(const nir_input_attachment_options *options, nir_builder *b)
{
- nir_foreach_variable(var, &b->shader->inputs) {
- if (var->data.location == VARYING_SLOT_POS)
- return nir_load_var(b, var);
+ if (options->use_fragcoord_sysval)
+ return nir_load_frag_coord(b);
+
+ nir_variable *pos =
+ nir_find_variable_with_location(b->shader, nir_var_shader_in,
+ VARYING_SLOT_POS);
+ if (pos == NULL) {
+ pos = nir_variable_create(b->shader, nir_var_shader_in,
+ glsl_vec4_type(), NULL);
+ pos->data.location = VARYING_SLOT_POS;
}
-
- nir_variable *pos = nir_variable_create(b->shader, nir_var_shader_in,
- glsl_vec4_type(), NULL);
- pos->data.location = VARYING_SLOT_POS;
/**
* From Vulkan spec:
* "The OriginLowerLeft execution mode must not be used; fragment entry
static bool
try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
- bool use_fragcoord_sysval)
+ const nir_input_attachment_options *options)
{
nir_deref_instr *deref = nir_src_as_deref(load->src[0]);
assert(glsl_type_is_image(deref->type));
nir_builder_init(&b, impl);
b.cursor = nir_instr_remove(&load->instr);
- nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
- : load_frag_coord(&b);
+ nir_ssa_def *frag_coord = load_frag_coord(options, &b);
frag_coord = nir_f2i32(&b, frag_coord);
nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2);
nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset);
return true;
}
+static bool
+try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
+ const nir_input_attachment_options *options)
+{
+ nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
+
+ 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 = load_frag_coord(options, &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)
+nir_lower_input_attachments(nir_shader *shader,
+ const nir_input_attachment_options *options)
{
assert(shader->info.stage == MESA_SHADER_FRAGMENT);
bool progress = false;
nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(instr, block) {
- if (instr->type != nir_instr_type_intrinsic)
- continue;
-
- 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);
+ switch (instr->type) {
+ case nir_instr_type_tex: {
+ nir_tex_instr *tex = nir_instr_as_tex(instr);
+
+ if (tex->op == nir_texop_fragment_mask_fetch ||
+ tex->op == nir_texop_fragment_fetch) {
+ progress |= try_lower_input_texop(function->impl, tex,
+ options);
+ }
+ break;
+ }
+ case nir_instr_type_intrinsic: {
+ nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr);
+
+ if (load->intrinsic == nir_intrinsic_image_deref_load) {
+ progress |= try_lower_input_load(function->impl, load,
+ options);
+ }
+ break;
+ }
+ default:
+ break;
+ }
}
}
}