#include "vc4_qir.h"
#include "kernel/vc4_packet.h"
-#include "tgsi/tgsi_info.h"
-#include "glsl/nir/nir_builder.h"
+#include "compiler/nir/nir_builder.h"
/** @file vc4_nir_lower_txf_ms.c
* Walks the NIR generated by TGSI-to-NIR to lower its nir_texop_txf_ms
* and do the math in the shader.
*/
-static void
-vc4_nir_lower_txf_ms_instr(struct vc4_compile *c, nir_builder *b,
- nir_tex_instr *txf_ms)
+static nir_ssa_def *
+vc4_nir_lower_txf_ms_instr(nir_builder *b, nir_instr *instr, void *data)
{
- if (txf_ms->op != nir_texop_txf_ms)
- return;
-
- b->cursor = nir_before_instr(&txf_ms->instr);
+ nir_tex_instr *txf_ms = nir_instr_as_tex(instr);
+ const struct vc4_compile *c = data;
nir_tex_instr *txf = nir_tex_instr_create(c->s, 1);
txf->op = nir_texop_txf;
- txf->sampler = txf_ms->sampler;
- txf->sampler_index = txf_ms->sampler_index;
+ txf->texture_index = txf_ms->texture_index;
txf->coord_components = txf_ms->coord_components;
txf->is_shadow = txf_ms->is_shadow;
txf->is_new_style_shadow = txf_ms->is_new_style_shadow;
uint32_t tile_h_shift = 5;
uint32_t tile_size = (tile_h * tile_w *
VC4_MAX_SAMPLES * sizeof(uint32_t));
- unsigned unit = txf_ms->sampler_index;
+ unsigned unit = txf_ms->texture_index;
uint32_t w = align(c->key->tex[unit].msaa_width, tile_w);
uint32_t w_tiles = w / tile_w;
txf->src[0].src_type = nir_tex_src_coord;
txf->src[0].src = nir_src_for_ssa(nir_vec2(b, addr, nir_imm_int(b, 0)));
- nir_ssa_dest_init(&txf->instr, &txf->dest, 4, NULL);
+ nir_ssa_dest_init(&txf->instr, &txf->dest, 4, 32, NULL);
nir_builder_instr_insert(b, &txf->instr);
- nir_ssa_def_rewrite_uses(&txf_ms->dest.ssa,
- nir_src_for_ssa(&txf->dest.ssa));
- nir_instr_remove(&txf_ms->instr);
-}
-
-static bool
-vc4_nir_lower_txf_ms_block(nir_block *block, void *arg)
-{
- struct vc4_compile *c = arg;
- nir_function_impl *impl =
- nir_cf_node_get_function(&block->cf_node);
-
- nir_builder b;
- nir_builder_init(&b, impl);
- nir_foreach_instr_safe(block, instr) {
- if (instr->type == nir_instr_type_tex) {
- vc4_nir_lower_txf_ms_instr(c, &b,
- nir_instr_as_tex(instr));
- }
- }
-
- return true;
+ return &txf->dest.ssa;
}
static bool
-vc4_nir_lower_txf_ms_impl(struct vc4_compile *c, nir_function_impl *impl)
+vc4_nir_lower_txf_ms_filter(const nir_instr *instr, const void *data)
{
- nir_foreach_block(impl, vc4_nir_lower_txf_ms_block, c);
-
- nir_metadata_preserve(impl,
- nir_metadata_block_index |
- nir_metadata_dominance);
-
- return true;
+ return (instr->type == nir_instr_type_tex &&
+ nir_instr_as_tex(instr)->op == nir_texop_txf_ms);
}
void
-vc4_nir_lower_txf_ms(struct vc4_compile *c)
+vc4_nir_lower_txf_ms(nir_shader *s, struct vc4_compile *c)
{
- nir_foreach_function(c->s, function) {
- if (function->impl)
- vc4_nir_lower_txf_ms_impl(c, function->impl);
- }
+ nir_shader_lower_instructions(s,
+ vc4_nir_lower_txf_ms_filter,
+ vc4_nir_lower_txf_ms_instr,
+ c);
}