freedreno/a5xx: set missing bary sysvals
[mesa.git] / src / gallium / drivers / freedreno / a5xx / fd5_program.c
index 752442b5ca483d48ad31bae65b7ffc2d66f50d64..7065cfe59c76e74e48ea7e0070e442ea73e7ff34 100644 (file)
@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/bitset.h"
 
 #include "freedreno_program.h"
 #include "fd5_texture.h"
 #include "fd5_format.h"
 
-static void
-delete_shader_stateobj(struct fd5_shader_stateobj *so)
-{
-       ir3_shader_destroy(so->shader);
-       free(so);
-}
-
-static struct fd5_shader_stateobj *
-create_shader_stateobj(struct pipe_context *pctx, const struct pipe_shader_state *cso,
-               enum shader_t type)
-{
-       struct fd_context *ctx = fd_context(pctx);
-       struct ir3_compiler *compiler = ctx->screen->compiler;
-       struct fd5_shader_stateobj *so = CALLOC_STRUCT(fd5_shader_stateobj);
-       so->shader = ir3_shader_create(compiler, cso, type, &ctx->debug);
-       return so;
-}
-
-static void *
-fd5_fp_state_create(struct pipe_context *pctx,
-               const struct pipe_shader_state *cso)
-{
-       return create_shader_stateobj(pctx, cso, SHADER_FRAGMENT);
-}
-
-static void
-fd5_fp_state_delete(struct pipe_context *pctx, void *hwcso)
-{
-       struct fd5_shader_stateobj *so = hwcso;
-       delete_shader_stateobj(so);
-}
-
-static void *
-fd5_vp_state_create(struct pipe_context *pctx,
-               const struct pipe_shader_state *cso)
-{
-       return create_shader_stateobj(pctx, cso, SHADER_VERTEX);
-}
-
-static void
-fd5_vp_state_delete(struct pipe_context *pctx, void *hwcso)
-{
-       struct fd5_shader_stateobj *so = hwcso;
-       delete_shader_stateobj(so);
-}
+#include "ir3_cache.h"
 
 void
 fd5_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so)
@@ -132,14 +88,14 @@ fd5_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so)
 static void
 link_stream_out(struct ir3_shader_linkage *l, const struct ir3_shader_variant *v)
 {
-       const struct pipe_stream_output_info *strmout = &v->shader->stream_output;
+       const struct ir3_stream_output_info *strmout = &v->shader->stream_output;
 
        /*
         * First, any stream-out varyings not already in linkage map (ie. also
         * consumed by frag shader) need to be added:
         */
        for (unsigned i = 0; i < strmout->num_outputs; i++) {
-               const struct pipe_stream_output *out = &strmout->output[i];
+               const struct ir3_stream_output *out = &strmout->output[i];
                unsigned k = out->register_index;
                unsigned compmask =
                        (1 << (out->num_components + out->start_component)) - 1;
@@ -180,14 +136,14 @@ static void
 emit_stream_out(struct fd_ringbuffer *ring, const struct ir3_shader_variant *v,
                struct ir3_shader_linkage *l)
 {
-       const struct pipe_stream_output_info *strmout = &v->shader->stream_output;
+       const struct ir3_stream_output_info *strmout = &v->shader->stream_output;
        unsigned ncomp[PIPE_MAX_SO_BUFFERS] = {0};
        unsigned prog[align(l->max_loc, 2) / 2];
 
        memset(prog, 0, sizeof(prog));
 
        for (unsigned i = 0; i < strmout->num_outputs; i++) {
-               const struct pipe_stream_output *out = &strmout->output[i];
+               const struct ir3_stream_output *out = &strmout->output[i];
                unsigned k = out->register_index;
                unsigned idx;
 
@@ -276,7 +232,8 @@ setup_stages(struct fd5_emit *emit, struct stage *s)
                if (s[i].v) {
                        s[i].i = &s[i].v->info;
                        /* constlen is in units of 4 * vec4: */
-                       s[i].constlen = align(s[i].v->constlen, 4) / 4;
+                       assert(s[i].v->constlen % 4 == 0);
+                       s[i].constlen = s[i].v->constlen / 4;
                        /* instrlen is already in units of 16 instr.. although
                         * probably we should ditch that and not make the compiler
                         * care about instruction group size of a3xx vs a5xx
@@ -324,12 +281,13 @@ setup_stages(struct fd5_emit *emit, struct stage *s)
 }
 
 void
-fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
+fd5_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring,
+                                struct fd5_emit *emit)
 {
        struct stage s[MAX_STAGES];
        uint32_t pos_regid, psize_regid, color_regid[8];
-       uint32_t face_regid, coord_regid, zwcoord_regid;
-       uint32_t vcoord_regid, vertex_regid, instance_regid;
+       uint32_t face_regid, coord_regid, zwcoord_regid, samp_id_regid, samp_mask_regid;
+       uint32_t ij_regid[IJ_COUNT], vertex_regid, instance_regid;
        enum a3xx_threadsize fssz;
        uint8_t psize_loc = ~0;
        int i, j;
@@ -340,7 +298,7 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
 
        pos_regid = ir3_find_output_regid(s[VS].v, VARYING_SLOT_POS);
        psize_regid = ir3_find_output_regid(s[VS].v, VARYING_SLOT_PSIZ);
-       vertex_regid = ir3_find_sysval_regid(s[VS].v, SYSTEM_VALUE_VERTEX_ID);
+       vertex_regid = ir3_find_sysval_regid(s[VS].v, SYSTEM_VALUE_VERTEX_ID_ZERO_BASE);
        instance_regid = ir3_find_sysval_regid(s[VS].v, SYSTEM_VALUE_INSTANCE_ID);
 
        if (s[FS].v->color0_mrt) {
@@ -358,11 +316,13 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
                color_regid[7] = ir3_find_output_regid(s[FS].v, FRAG_RESULT_DATA7);
        }
 
-       /* TODO get these dynamically: */
-       face_regid = s[FS].v->frag_face ? regid(0,0) : regid(63,0);
-       coord_regid = s[FS].v->frag_coord ? regid(0,0) : regid(63,0);
-       zwcoord_regid = s[FS].v->frag_coord ? regid(0,2) : regid(63,0);
-       vcoord_regid = (s[FS].v->total_in > 0) ? s[FS].v->pos_regid : regid(63,0);
+       samp_id_regid   = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_SAMPLE_ID);
+       samp_mask_regid = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_SAMPLE_MASK_IN);
+       face_regid      = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRONT_FACE);
+       coord_regid     = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_FRAG_COORD);
+       zwcoord_regid   = (coord_regid == regid(63,0)) ? regid(63,0) : (coord_regid + 2);
+       for (unsigned i = 0; i < ARRAY_SIZE(ij_regid); i++)
+               ij_regid[i] = ir3_find_sysval_regid(s[FS].v, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL + i);
 
        /* we could probably divide this up into things that need to be
         * emitted if frag-prog is dirty vs if vert-prog is dirty..
@@ -448,28 +408,21 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
        OUT_RING(ring, A5XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT(s[VS].i->max_half_reg + 1) |
                        A5XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT(s[VS].i->max_reg + 1) |
                        0x6 | /* XXX seems to be always set? */
-                       A5XX_SP_VS_CTRL_REG0_BRANCHSTACK(0x3) |  // XXX need to figure this out somehow..
-                       COND(s[VS].v->has_samp, A5XX_SP_VS_CTRL_REG0_PIXLODENABLE));
+                       A5XX_SP_VS_CTRL_REG0_BRANCHSTACK(s[VS].v->branchstack) |
+                       COND(s[VS].v->need_pixlod, A5XX_SP_VS_CTRL_REG0_PIXLODENABLE));
 
        struct ir3_shader_linkage l = {0};
-       ir3_link_shaders(&l, s[VS].v, s[FS].v);
+       ir3_link_shaders(&l, s[VS].v, s[FS].v, true);
 
        if ((s[VS].v->shader->stream_output.num_outputs > 0) &&
-                       !emit->key.binning_pass)
+                       !emit->binning_pass)
                link_stream_out(&l, s[VS].v);
 
-       BITSET_DECLARE(varbs, 128) = {0};
-       uint32_t *varmask = (uint32_t *)varbs;
-
-       for (i = 0; i < l.cnt; i++)
-               for (j = 0; j < util_last_bit(l.var[i].compmask); j++)
-                       BITSET_SET(varbs, l.var[i].loc + j);
-
        OUT_PKT4(ring, REG_A5XX_VPC_VAR_DISABLE(0), 4);
-       OUT_RING(ring, ~varmask[0]);  /* VPC_VAR[0].DISABLE */
-       OUT_RING(ring, ~varmask[1]);  /* VPC_VAR[1].DISABLE */
-       OUT_RING(ring, ~varmask[2]);  /* VPC_VAR[2].DISABLE */
-       OUT_RING(ring, ~varmask[3]);  /* VPC_VAR[3].DISABLE */
+       OUT_RING(ring, ~l.varmask[0]);  /* VPC_VAR[0].DISABLE */
+       OUT_RING(ring, ~l.varmask[1]);  /* VPC_VAR[1].DISABLE */
+       OUT_RING(ring, ~l.varmask[2]);  /* VPC_VAR[2].DISABLE */
+       OUT_RING(ring, ~l.varmask[3]);  /* VPC_VAR[3].DISABLE */
 
        /* a5xx appends pos/psize to end of the linkage map: */
        if (pos_regid != regid(63,0))
@@ -481,7 +434,7 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
        }
 
        if ((s[VS].v->shader->stream_output.num_outputs > 0) &&
-                       !emit->key.binning_pass) {
+                       !emit->binning_pass) {
                emit_stream_out(ring, s[VS].v, &l);
 
                OUT_PKT4(ring, REG_A5XX_VPC_SO_OVERRIDE, 1);
@@ -530,27 +483,22 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
        OUT_PKT4(ring, REG_A5XX_PC_PRIM_VTX_CNTL, 1);
        OUT_RING(ring, COND(s[VS].v->writes_psize, A5XX_PC_PRIM_VTX_CNTL_PSIZE));
 
-       if (emit->key.binning_pass) {
+       OUT_PKT4(ring, REG_A5XX_SP_PRIMITIVE_CNTL, 1);
+       OUT_RING(ring, A5XX_SP_PRIMITIVE_CNTL_VSOUT(l.cnt));
+
+       OUT_PKT4(ring, REG_A5XX_VPC_CNTL_0, 1);
+       OUT_RING(ring, A5XX_VPC_CNTL_0_STRIDE_IN_VPC(l.max_loc) |
+                       COND(s[FS].v->total_in > 0, A5XX_VPC_CNTL_0_VARYING) |
+                       COND(s[FS].v->fragcoord_compmask != 0, A5XX_VPC_CNTL_0_VARYING) |
+                       0x10000);    // XXX
+
+       fd5_context(ctx)->max_loc = l.max_loc;
+
+       if (emit->binning_pass) {
                OUT_PKT4(ring, REG_A5XX_SP_FS_OBJ_START_LO, 2);
                OUT_RING(ring, 0x00000000);    /* SP_FS_OBJ_START_LO */
                OUT_RING(ring, 0x00000000);    /* SP_FS_OBJ_START_HI */
        } else {
-               // TODO if some of these other bits depend on something other than
-               // program state we should probably move these next three regs:
-
-               OUT_PKT4(ring, REG_A5XX_SP_PRIMITIVE_CNTL, 1);
-               OUT_RING(ring, A5XX_SP_PRIMITIVE_CNTL_VSOUT(l.cnt));
-
-               OUT_PKT4(ring, REG_A5XX_VPC_CNTL_0, 1);
-               OUT_RING(ring, A5XX_VPC_CNTL_0_STRIDE_IN_VPC(l.max_loc) |
-                               COND(s[FS].v->total_in > 0, A5XX_VPC_CNTL_0_VARYING) |
-                               COND(s[FS].v->frag_coord, A5XX_VPC_CNTL_0_VARYING) |
-                               0x10000);    // XXX
-
-               OUT_PKT4(ring, REG_A5XX_PC_PRIMITIVE_CNTL, 1);
-               OUT_RING(ring, A5XX_PC_PRIMITIVE_CNTL_STRIDE_IN_VPC(l.max_loc) |
-                               0x400);      // XXX
-
                OUT_PKT4(ring, REG_A5XX_SP_FS_OBJ_START_LO, 2);
                OUT_RELOC(ring, s[FS].v->bo, 0, 0, 0);  /* SP_FS_OBJ_START_LO/HI */
        }
@@ -561,22 +509,28 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
                        0x00000880);               /* XXX HLSQ_CONTROL_0 */
        OUT_RING(ring, A5XX_HLSQ_CONTROL_1_REG_PRIMALLOCTHRESHOLD(63));
        OUT_RING(ring, A5XX_HLSQ_CONTROL_2_REG_FACEREGID(face_regid) |
-                       0xfcfcfc00);               /* XXX */
-       OUT_RING(ring, A5XX_HLSQ_CONTROL_3_REG_FRAGCOORDXYREGID(vcoord_regid) |
-                       0xfcfcfc00);               /* XXX */
+                       A5XX_HLSQ_CONTROL_2_REG_SAMPLEID(samp_id_regid) |
+                       A5XX_HLSQ_CONTROL_2_REG_SAMPLEMASK(samp_mask_regid) |
+                       A5XX_HLSQ_CONTROL_2_REG_SIZE(ij_regid[IJ_PERSP_SIZE]));
+       OUT_RING(ring,
+                       A5XX_HLSQ_CONTROL_3_REG_IJ_PERSP_PIXEL(ij_regid[IJ_PERSP_PIXEL]) |
+                       A5XX_HLSQ_CONTROL_3_REG_IJ_LINEAR_PIXEL(ij_regid[IJ_LINEAR_PIXEL]) |
+                       A5XX_HLSQ_CONTROL_3_REG_IJ_PERSP_CENTROID(ij_regid[IJ_PERSP_CENTROID]) |
+                       A5XX_HLSQ_CONTROL_3_REG_IJ_PERSP_CENTROID(ij_regid[IJ_LINEAR_CENTROID]));
        OUT_RING(ring, A5XX_HLSQ_CONTROL_4_REG_XYCOORDREGID(coord_regid) |
                        A5XX_HLSQ_CONTROL_4_REG_ZWCOORDREGID(zwcoord_regid) |
-                       0x0000fcfc);               /* XXX */
+                       A5XX_HLSQ_CONTROL_4_REG_IJ_PERSP_SAMPLE(ij_regid[IJ_PERSP_SAMPLE]) |
+                       A5XX_HLSQ_CONTROL_4_REG_IJ_LINEAR_SAMPLE(ij_regid[IJ_LINEAR_SAMPLE]));
 
        OUT_PKT4(ring, REG_A5XX_SP_FS_CTRL_REG0, 1);
        OUT_RING(ring, COND(s[FS].v->total_in > 0, A5XX_SP_FS_CTRL_REG0_VARYING) |
-                       COND(s[FS].v->frag_coord, A5XX_SP_FS_CTRL_REG0_VARYING) |
+                       COND(s[FS].v->fragcoord_compmask != 0, A5XX_SP_FS_CTRL_REG0_VARYING) |
                        0x40006 | /* XXX set pretty much everywhere */
                        A5XX_SP_FS_CTRL_REG0_THREADSIZE(fssz) |
                        A5XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT(s[FS].i->max_half_reg + 1) |
                        A5XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT(s[FS].i->max_reg + 1) |
-                       A5XX_SP_FS_CTRL_REG0_BRANCHSTACK(0x3) |  // XXX need to figure this out somehow..
-                       COND(s[FS].v->has_samp, A5XX_SP_FS_CTRL_REG0_PIXLODENABLE));
+                       A5XX_SP_FS_CTRL_REG0_BRANCHSTACK(s[FS].v->branchstack) |
+                       COND(s[FS].v->need_pixlod, A5XX_SP_FS_CTRL_REG0_PIXLODENABLE));
 
        OUT_PKT4(ring, REG_A5XX_HLSQ_UPDATE_CNTL, 1);
        OUT_RING(ring, 0x020fffff);        /* XXX */
@@ -587,36 +541,48 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
        OUT_PKT4(ring, REG_A5XX_SP_SP_CNTL, 1);
        OUT_RING(ring, 0x00000010);        /* XXX */
 
+       /* XXX: missing enable bits for per-sample bary linear centroid and IJ_PERSP_SIZE
+        * (should be identical to a6xx)
+        */
+
        OUT_PKT4(ring, REG_A5XX_GRAS_CNTL, 1);
-       OUT_RING(ring, COND(s[FS].v->total_in > 0, A5XX_GRAS_CNTL_VARYING) |
-                       COND(s[FS].v->frag_coord, A5XX_GRAS_CNTL_XCOORD |
-                                       A5XX_GRAS_CNTL_YCOORD |
-                                       A5XX_GRAS_CNTL_ZCOORD |
-                                       A5XX_GRAS_CNTL_WCOORD |
-                                       A5XX_GRAS_CNTL_UNK3) |
-                       COND(s[FS].v->frag_face, A5XX_GRAS_CNTL_UNK3));
+       OUT_RING(ring,
+                       CONDREG(ij_regid[IJ_PERSP_PIXEL], A5XX_GRAS_CNTL_IJ_PERSP_PIXEL) |
+                       CONDREG(ij_regid[IJ_PERSP_CENTROID], A5XX_GRAS_CNTL_IJ_PERSP_CENTROID) |
+                       COND(s[FS].v->fragcoord_compmask != 0,
+                                       A5XX_GRAS_CNTL_COORD_MASK(s[FS].v->fragcoord_compmask) |
+                                       A5XX_GRAS_CNTL_SIZE) |
+                       COND(s[FS].v->frag_face, A5XX_GRAS_CNTL_SIZE) |
+                       CONDREG(ij_regid[IJ_LINEAR_PIXEL], A5XX_GRAS_CNTL_SIZE));
 
        OUT_PKT4(ring, REG_A5XX_RB_RENDER_CONTROL0, 2);
-       OUT_RING(ring, COND(s[FS].v->total_in > 0, A5XX_RB_RENDER_CONTROL0_VARYING) |
-                       COND(s[FS].v->frag_coord, A5XX_RB_RENDER_CONTROL0_XCOORD |
-                                       A5XX_RB_RENDER_CONTROL0_YCOORD |
-                                       A5XX_RB_RENDER_CONTROL0_ZCOORD |
-                                       A5XX_RB_RENDER_CONTROL0_WCOORD |
-                                       A5XX_RB_RENDER_CONTROL0_UNK3) |
-                       COND(s[FS].v->frag_face, A5XX_RB_RENDER_CONTROL0_UNK3));
-       OUT_RING(ring, COND(s[FS].v->frag_face, A5XX_RB_RENDER_CONTROL1_FACENESS));
+       OUT_RING(ring,
+                       CONDREG(ij_regid[IJ_PERSP_PIXEL], A5XX_RB_RENDER_CONTROL0_IJ_PERSP_PIXEL) |
+                       CONDREG(ij_regid[IJ_PERSP_CENTROID], A5XX_RB_RENDER_CONTROL0_IJ_PERSP_CENTROID) |
+                       COND(s[FS].v->fragcoord_compmask != 0,
+                                       A5XX_RB_RENDER_CONTROL0_COORD_MASK(s[FS].v->fragcoord_compmask) |
+                                       A5XX_RB_RENDER_CONTROL0_SIZE) |
+                       COND(s[FS].v->frag_face, A5XX_RB_RENDER_CONTROL0_SIZE) |
+                       CONDREG(ij_regid[IJ_LINEAR_PIXEL], A5XX_RB_RENDER_CONTROL0_SIZE));
+       OUT_RING(ring,
+                       COND(samp_mask_regid != regid(63, 0),
+                               A5XX_RB_RENDER_CONTROL1_SAMPLEMASK) |
+                       COND(s[FS].v->frag_face, A5XX_RB_RENDER_CONTROL1_FACENESS) |
+                       COND(samp_id_regid != regid(63, 0),
+                               A5XX_RB_RENDER_CONTROL1_SAMPLEID));
 
        OUT_PKT4(ring, REG_A5XX_SP_FS_OUTPUT_REG(0), 8);
        for (i = 0; i < 8; i++) {
                OUT_RING(ring, A5XX_SP_FS_OUTPUT_REG_REGID(color_regid[i]) |
-                               COND(emit->key.half_precision,
-                                       A5XX_SP_FS_OUTPUT_REG_HALF_PRECISION));
+                               COND(color_regid[i] & HALF_REG_ID, A5XX_SP_FS_OUTPUT_REG_HALF_PRECISION));
        }
 
-       if (emit->key.binning_pass) {
-               OUT_PKT4(ring, REG_A5XX_VPC_PACK, 1);
-               OUT_RING(ring, A5XX_VPC_PACK_NUMNONPOSVAR(0));
-       } else {
+
+       OUT_PKT4(ring, REG_A5XX_VPC_PACK, 1);
+       OUT_RING(ring, A5XX_VPC_PACK_NUMNONPOSVAR(s[FS].v->total_in) |
+                       A5XX_VPC_PACK_PSIZELOC(psize_loc));
+
+       if (!emit->binning_pass) {
                uint32_t vinterp[8], vpsrepl[8];
 
                memset(vinterp, 0, sizeof(vinterp));
@@ -660,48 +626,36 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
                                }
                        }
 
-                       gl_varying_slot slot = s[FS].v->inputs[j].slot;
-
-                       /* since we don't enable PIPE_CAP_TGSI_TEXCOORD: */
-                       if (slot >= VARYING_SLOT_VAR0) {
-                               unsigned texmask = 1 << (slot - VARYING_SLOT_VAR0);
-                               /* Replace the .xy coordinates with S/T from the point sprite. Set
-                                * interpolation bits for .zw such that they become .01
+                       bool coord_mode = emit->sprite_coord_mode;
+                       if (ir3_point_sprite(s[FS].v, j, emit->sprite_coord_enable, &coord_mode)) {
+                               /* mask is two 2-bit fields, where:
+                                *   '01' -> S
+                                *   '10' -> T
+                                *   '11' -> 1 - T  (flip mode)
                                 */
-                               if (emit->sprite_coord_enable & texmask) {
-                                       /* mask is two 2-bit fields, where:
-                                        *   '01' -> S
-                                        *   '10' -> T
-                                        *   '11' -> 1 - T  (flip mode)
-                                        */
-                                       unsigned mask = emit->sprite_coord_mode ? 0b1101 : 0b1001;
-                                       uint32_t loc = inloc;
-                                       if (compmask & 0x1) {
-                                               vpsrepl[loc / 16] |= ((mask >> 0) & 0x3) << ((loc % 16) * 2);
-                                               loc++;
-                                       }
-                                       if (compmask & 0x2) {
-                                               vpsrepl[loc / 16] |= ((mask >> 2) & 0x3) << ((loc % 16) * 2);
-                                               loc++;
-                                       }
-                                       if (compmask & 0x4) {
-                                               /* .z <- 0.0f */
-                                               vinterp[loc / 16] |= 0b10 << ((loc % 16) * 2);
-                                               loc++;
-                                       }
-                                       if (compmask & 0x8) {
-                                               /* .w <- 1.0f */
-                                               vinterp[loc / 16] |= 0b11 << ((loc % 16) * 2);
-                                               loc++;
-                                       }
+                               unsigned mask = coord_mode ? 0b1101 : 0b1001;
+                               uint32_t loc = inloc;
+                               if (compmask & 0x1) {
+                                       vpsrepl[loc / 16] |= ((mask >> 0) & 0x3) << ((loc % 16) * 2);
+                                       loc++;
+                               }
+                               if (compmask & 0x2) {
+                                       vpsrepl[loc / 16] |= ((mask >> 2) & 0x3) << ((loc % 16) * 2);
+                                       loc++;
+                               }
+                               if (compmask & 0x4) {
+                                       /* .z <- 0.0f */
+                                       vinterp[loc / 16] |= 0b10 << ((loc % 16) * 2);
+                                       loc++;
+                               }
+                               if (compmask & 0x8) {
+                                       /* .w <- 1.0f */
+                                       vinterp[loc / 16] |= 0b11 << ((loc % 16) * 2);
+                                       loc++;
                                }
                        }
                }
 
-               OUT_PKT4(ring, REG_A5XX_VPC_PACK, 1);
-               OUT_RING(ring, A5XX_VPC_PACK_NUMNONPOSVAR(s[FS].v->total_in) |
-                               A5XX_VPC_PACK_PSIZELOC(psize_loc));
-
                OUT_PKT4(ring, REG_A5XX_VPC_VARYING_INTERP_MODE(0), 8);
                for (i = 0; i < 8; i++)
                        OUT_RING(ring, vinterp[i]);     /* VPC_VARYING_INTERP[i].MODE */
@@ -711,7 +665,7 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
                        OUT_RING(ring, vpsrepl[i]);   /* VPC_VARYING_PS_REPL[i] */
        }
 
-       if (!emit->key.binning_pass)
+       if (!emit->binning_pass)
                if (s[FS].instrlen)
                        fd5_emit_shader(ring, s[FS].v);
 
@@ -728,11 +682,6 @@ fd5_program_emit(struct fd_ringbuffer *ring, struct fd5_emit *emit)
 void
 fd5_prog_init(struct pipe_context *pctx)
 {
-       pctx->create_fs_state = fd5_fp_state_create;
-       pctx->delete_fs_state = fd5_fp_state_delete;
-
-       pctx->create_vs_state = fd5_vp_state_create;
-       pctx->delete_vs_state = fd5_vp_state_delete;
-
+       ir3_prog_init(pctx);
        fd_prog_init(pctx);
 }