freedreno/ir3: switch PIPE_CAP_TGSI_TEXCOORD

[mesa.git] / src / freedreno / ir3 / ir3_a4xx.c

diff --git a/src/freedreno/ir3/ir3_a4xx.c b/src/freedreno/ir3/ir3_a4xx.c
index 444b7c592f2dc88cedbc41b00d6a690240dacc00..968b1d74b045a5471d5cebd88699cb4c0e9bb67c 100644 (file)
--- a/src/freedreno/ir3/ir3_a4xx.c
+++ b/src/freedreno/ir3/ir3_a4xx.c
@@ -42,8 +42,7 @@ emit_intrinsic_load_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr,
        struct ir3_block *b = ctx->block;
        struct ir3_instruction *ldgb, *src0, *src1, *byte_offset, *offset;
 
-       /* can this be non-const buffer_index?  how do we handle that? */
-       int ibo_idx = ir3_ssbo_to_ibo(ctx->so->shader, nir_src_as_uint(intr->src[0]));
+       struct ir3_instruction *ssbo = ir3_ssbo_to_ibo(ctx, intr->src[0]);
 
        byte_offset = ir3_get_src(ctx, &intr->src[1])[0];
        offset = ir3_get_src(ctx, &intr->src[2])[0];
@@ -55,7 +54,7 @@ emit_intrinsic_load_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr,
        }, 2);
        src1 = offset;
 
-       ldgb = ir3_LDGB(b, create_immed(b, ibo_idx), 0,
+       ldgb = ir3_LDGB(b, ssbo, 0,
                        src0, 0, src1, 0);
        ldgb->regs[0]->wrmask = MASK(intr->num_components);
        ldgb->cat6.iim_val = intr->num_components;
@@ -73,15 +72,12 @@ emit_intrinsic_store_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr)
 {
        struct ir3_block *b = ctx->block;
        struct ir3_instruction *stgb, *src0, *src1, *src2, *byte_offset, *offset;
-       /* TODO handle wrmask properly, see _store_shared().. but I think
-        * it is more a PITA than that, since blob ends up loading the
-        * masked components and writing them back out.
-        */
-       unsigned wrmask = intr->const_index[0];
+       unsigned wrmask = nir_intrinsic_write_mask(intr);
        unsigned ncomp = ffs(~wrmask) - 1;
 
-       /* can this be non-const buffer_index?  how do we handle that? */
-       int ibo_idx = ir3_ssbo_to_ibo(ctx->so->shader, nir_src_as_uint(intr->src[1]));
+       assert(wrmask == BITFIELD_MASK(intr->num_components));
+
+       struct ir3_instruction *ssbo = ir3_ssbo_to_ibo(ctx, intr->src[1]);
 
        byte_offset = ir3_get_src(ctx, &intr->src[2])[0];
        offset = ir3_get_src(ctx, &intr->src[3])[0];
@@ -96,7 +92,7 @@ emit_intrinsic_store_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr)
                create_immed(b, 0),
        }, 2);
 
-       stgb = ir3_STGB(b, create_immed(b, ibo_idx), 0, src0, 0, src1, 0, src2, 0);
+       stgb = ir3_STGB(b, ssbo, 0, src0, 0, src1, 0, src2, 0);
        stgb->cat6.iim_val = ncomp;
        stgb->cat6.d = 4;
        stgb->cat6.type = TYPE_U32;
@@ -131,9 +127,7 @@ emit_intrinsic_atomic_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr)
                *offset;
        type_t type = TYPE_U32;
 
-       /* can this be non-const buffer_index?  how do we handle that? */
-       int ibo_idx = ir3_ssbo_to_ibo(ctx->so->shader, nir_src_as_uint(intr->src[0]));
-       ssbo = create_immed(b, ibo_idx);
+       ssbo = ir3_ssbo_to_ibo(ctx, intr->src[0]);
 
        byte_offset = ir3_get_src(ctx, &intr->src[1])[0];
        offset = ir3_get_src(ctx, &intr->src[3])[0];
@@ -218,7 +212,7 @@ get_image_offset(struct ir3_context *ctx, const nir_intrinsic_instr *instr,
        /* to calculate the byte offset (yes, uggg) we need (up to) three
         * const values to know the bytes per pixel, and y and z stride:
         */
-       struct ir3_const_state *const_state = &ctx->so->shader->const_state;
+       const struct ir3_const_state *const_state = ir3_const_state(ctx->so);
        unsigned cb = regid(const_state->offsets.image_dims, 0) +
                const_state->image_dims.off[index];
 
@@ -259,9 +253,8 @@ emit_intrinsic_store_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
        struct ir3_instruction *stib, *offset;
        struct ir3_instruction * const *value = ir3_get_src(ctx, &intr->src[3]);
        struct ir3_instruction * const *coords = ir3_get_src(ctx, &intr->src[1]);
+       struct ir3_instruction * ibo = ir3_image_to_ibo(ctx, intr->src[0]);
        unsigned ncoords = ir3_get_image_coords(intr, NULL);
-       unsigned slot = nir_src_as_uint(intr->src[0]);
-       unsigned ibo_idx = ir3_image_to_ibo(ctx->so->shader, slot);
        unsigned ncomp = ir3_get_num_components_for_image_format(nir_intrinsic_format(intr));
 
        /* src0 is value
@@ -276,7 +269,7 @@ emit_intrinsic_store_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
         * one over the other in various cases.
         */
 
-       stib = ir3_STIB(b, create_immed(b, ibo_idx), 0,
+       stib = ir3_STIB(b, ibo, 0,
                        ir3_create_collect(ctx, value, ncomp), 0,
                        ir3_create_collect(ctx, coords, ncoords), 0,
                        offset, 0);
@@ -295,13 +288,10 @@ static struct ir3_instruction *
 emit_intrinsic_atomic_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
 {
        struct ir3_block *b = ctx->block;
-       struct ir3_instruction *atomic, *image, *src0, *src1, *src2;
+       struct ir3_instruction *atomic, *src0, *src1, *src2;
        struct ir3_instruction * const *coords = ir3_get_src(ctx, &intr->src[1]);
+       struct ir3_instruction * image = ir3_image_to_ibo(ctx, intr->src[0]);
        unsigned ncoords = ir3_get_image_coords(intr, NULL);
-       unsigned slot = nir_src_as_uint(intr->src[0]);
-       unsigned ibo_idx = ir3_image_to_ibo(ctx->so->shader, slot);
-
-       image = create_immed(b, ibo_idx);
 
        /* src0 is value (or uvec2(value, compare))
         * src1 is coords
@@ -366,4 +356,5 @@ const struct ir3_context_funcs ir3_a4xx_funcs = {
                .emit_intrinsic_atomic_ssbo = emit_intrinsic_atomic_ssbo,
                .emit_intrinsic_store_image = emit_intrinsic_store_image,
                .emit_intrinsic_atomic_image = emit_intrinsic_atomic_image,
+               .emit_intrinsic_image_size = emit_intrinsic_image_size_tex,
 };