u_upload_mgr: pass alignment to u_upload_alloc manually
[mesa.git] / src / gallium / drivers / freedreno / a4xx / fd4_emit.c
index df96601c747c0c19de3d886d8cf34d794863d62f..bc62a5d9a4b02f21f8149bfdc489764fbdf1b4fa 100644 (file)
@@ -124,7 +124,21 @@ static void
 emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                enum adreno_state_block sb, struct fd_texture_stateobj *tex)
 {
-       unsigned i;
+       static const uint32_t bcolor_reg[] = {
+                       [SB_VERT_TEX] = REG_A4XX_TPL1_TP_VS_BORDER_COLOR_BASE_ADDR,
+                       [SB_FRAG_TEX] = REG_A4XX_TPL1_TP_FS_BORDER_COLOR_BASE_ADDR,
+       };
+       struct fd4_context *fd4_ctx = fd4_context(ctx);
+       unsigned i, off;
+       void *ptr;
+
+       u_upload_alloc(fd4_ctx->border_color_uploader,
+                       0, BORDER_COLOR_UPLOAD_SIZE,
+                      BORDER_COLOR_UPLOAD_SIZE, &off,
+                       &fd4_ctx->border_color_buf,
+                       &ptr);
+
+       fd_setup_border_colors(tex, ptr, 0);
 
        if (tex->num_samplers > 0) {
                int num_samplers;
@@ -172,7 +186,6 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                        const struct fd4_pipe_sampler_view *view = tex->textures[i] ?
                                        fd4_pipe_sampler_view(tex->textures[i]) :
                                        &dummy_view;
-                       unsigned start = view->base.u.tex.first_level;
 
                        OUT_RING(ring, view->texconst0);
                        OUT_RING(ring, view->texconst1);
@@ -180,8 +193,7 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                        OUT_RING(ring, view->texconst3);
                        if (view->base.texture) {
                                struct fd_resource *rsc = fd_resource(view->base.texture);
-                               uint32_t offset = fd_resource_offset(rsc, start, 0);
-                               OUT_RELOC(ring, rsc->bo, offset, view->textconst4, 0);
+                               OUT_RELOC(ring, rsc->bo, view->offset, view->texconst4, 0);
                        } else {
                                OUT_RING(ring, 0x00000000);
                        }
@@ -190,6 +202,11 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                        OUT_RING(ring, 0x00000000);
                }
        }
+
+       OUT_PKT0(ring, bcolor_reg[sb], 1);
+       OUT_RELOC(ring, fd_resource(fd4_ctx->border_color_buf)->bo, off, 0, 0);
+
+       u_upload_unmap(fd4_ctx->border_color_uploader);
 }
 
 /* emit texture state for mem->gmem restore operation.. eventually it would
@@ -197,51 +214,111 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
  * special cases..
  */
 void
-fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, struct pipe_surface *psurf)
+fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, unsigned nr_bufs,
+               struct pipe_surface **bufs)
 {
-       struct fd_resource *rsc = fd_resource(psurf->texture);
-       unsigned lvl = psurf->u.tex.level;
-       struct fd_resource_slice *slice = fd_resource_slice(rsc, lvl);
-       uint32_t offset = fd_resource_offset(rsc, lvl, psurf->u.tex.first_layer);
-       enum pipe_format format = fd4_gmem_restore_format(psurf->format);
+       unsigned char mrt_comp[A4XX_MAX_RENDER_TARGETS];
+       int i;
 
-       debug_assert(psurf->u.tex.first_layer == psurf->u.tex.last_layer);
+       for (i = 0; i < A4XX_MAX_RENDER_TARGETS; i++) {
+               mrt_comp[i] = (i < nr_bufs) ? 0xf : 0;
+       }
 
        /* output sampler state: */
-       OUT_PKT3(ring, CP_LOAD_STATE, 4);
+       OUT_PKT3(ring, CP_LOAD_STATE, 2 + (2 * nr_bufs));
        OUT_RING(ring, CP_LOAD_STATE_0_DST_OFF(0) |
                        CP_LOAD_STATE_0_STATE_SRC(SS_DIRECT) |
                        CP_LOAD_STATE_0_STATE_BLOCK(SB_FRAG_TEX) |
-                       CP_LOAD_STATE_0_NUM_UNIT(1));
+                       CP_LOAD_STATE_0_NUM_UNIT(nr_bufs));
        OUT_RING(ring, CP_LOAD_STATE_1_STATE_TYPE(ST_SHADER) |
                        CP_LOAD_STATE_1_EXT_SRC_ADDR(0));
-       OUT_RING(ring, A4XX_TEX_SAMP_0_XY_MAG(A4XX_TEX_NEAREST) |
-                       A4XX_TEX_SAMP_0_XY_MIN(A4XX_TEX_NEAREST) |
-                       A4XX_TEX_SAMP_0_WRAP_S(A4XX_TEX_CLAMP_TO_EDGE) |
-                       A4XX_TEX_SAMP_0_WRAP_T(A4XX_TEX_CLAMP_TO_EDGE) |
-                       A4XX_TEX_SAMP_0_WRAP_R(A4XX_TEX_REPEAT));
-       OUT_RING(ring, 0x00000000);
+       for (i = 0; i < nr_bufs; i++) {
+               OUT_RING(ring, A4XX_TEX_SAMP_0_XY_MAG(A4XX_TEX_NEAREST) |
+                               A4XX_TEX_SAMP_0_XY_MIN(A4XX_TEX_NEAREST) |
+                               A4XX_TEX_SAMP_0_WRAP_S(A4XX_TEX_CLAMP_TO_EDGE) |
+                               A4XX_TEX_SAMP_0_WRAP_T(A4XX_TEX_CLAMP_TO_EDGE) |
+                               A4XX_TEX_SAMP_0_WRAP_R(A4XX_TEX_REPEAT));
+               OUT_RING(ring, 0x00000000);
+       }
 
        /* emit texture state: */
-       OUT_PKT3(ring, CP_LOAD_STATE, 10);
+       OUT_PKT3(ring, CP_LOAD_STATE, 2 + (8 * nr_bufs));
        OUT_RING(ring, CP_LOAD_STATE_0_DST_OFF(0) |
                        CP_LOAD_STATE_0_STATE_SRC(SS_DIRECT) |
                        CP_LOAD_STATE_0_STATE_BLOCK(SB_FRAG_TEX) |
-                       CP_LOAD_STATE_0_NUM_UNIT(1));
+                       CP_LOAD_STATE_0_NUM_UNIT(nr_bufs));
        OUT_RING(ring, CP_LOAD_STATE_1_STATE_TYPE(ST_CONSTANTS) |
                        CP_LOAD_STATE_1_EXT_SRC_ADDR(0));
-       OUT_RING(ring, A4XX_TEX_CONST_0_FMT(fd4_pipe2tex(format)) |
-                       A4XX_TEX_CONST_0_TYPE(A4XX_TEX_2D) |
-                       fd4_tex_swiz(format,  PIPE_SWIZZLE_RED, PIPE_SWIZZLE_GREEN,
-                                       PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_ALPHA));
-       OUT_RING(ring, A4XX_TEX_CONST_1_WIDTH(psurf->width) |
-                       A4XX_TEX_CONST_1_HEIGHT(psurf->height));
-       OUT_RING(ring, A4XX_TEX_CONST_2_PITCH(slice->pitch * rsc->cpp));
-       OUT_RING(ring, 0x00000000);
-       OUT_RELOC(ring, rsc->bo, offset, 0, 0);
-       OUT_RING(ring, 0x00000000);
-       OUT_RING(ring, 0x00000000);
-       OUT_RING(ring, 0x00000000);
+       for (i = 0; i < nr_bufs; i++) {
+               if (bufs[i]) {
+                       struct fd_resource *rsc = fd_resource(bufs[i]->texture);
+                       /* note: PIPE_BUFFER disallowed for surfaces */
+                       unsigned lvl = bufs[i]->u.tex.level;
+                       struct fd_resource_slice *slice = fd_resource_slice(rsc, lvl);
+                       uint32_t offset = fd_resource_offset(rsc, lvl, bufs[i]->u.tex.first_layer);
+                       enum pipe_format format = fd4_gmem_restore_format(bufs[i]->format);
+
+                       /* The restore blit_zs shader expects stencil in sampler 0,
+                        * and depth in sampler 1
+                        */
+                       if (rsc->stencil && (i == 0)) {
+                               rsc = rsc->stencil;
+                               format = fd4_gmem_restore_format(rsc->base.b.format);
+                       }
+
+                       /* z32 restore is accomplished using depth write.  If there is
+                        * no stencil component (ie. PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
+                        * then no render target:
+                        *
+                        * (The same applies for z32_s8x24, since for stencil sampler
+                        * state the above 'if' will replace 'format' with s8)
+                        */
+                       if ((format == PIPE_FORMAT_Z32_FLOAT) ||
+                                       (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT))
+                               mrt_comp[i] = 0;
+
+                       debug_assert(bufs[i]->u.tex.first_layer == bufs[i]->u.tex.last_layer);
+
+                       OUT_RING(ring, A4XX_TEX_CONST_0_FMT(fd4_pipe2tex(format)) |
+                                       A4XX_TEX_CONST_0_TYPE(A4XX_TEX_2D) |
+                                       fd4_tex_swiz(format,  PIPE_SWIZZLE_RED, PIPE_SWIZZLE_GREEN,
+                                                       PIPE_SWIZZLE_BLUE, PIPE_SWIZZLE_ALPHA));
+                       OUT_RING(ring, A4XX_TEX_CONST_1_WIDTH(bufs[i]->width) |
+                                       A4XX_TEX_CONST_1_HEIGHT(bufs[i]->height));
+                       OUT_RING(ring, A4XX_TEX_CONST_2_PITCH(slice->pitch * rsc->cpp) |
+                                       A4XX_TEX_CONST_2_FETCHSIZE(fd4_pipe2fetchsize(format)));
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RELOC(ring, rsc->bo, offset, 0, 0);
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+               } else {
+                       OUT_RING(ring, A4XX_TEX_CONST_0_FMT(0) |
+                                       A4XX_TEX_CONST_0_TYPE(A4XX_TEX_2D) |
+                                       A4XX_TEX_CONST_0_SWIZ_X(A4XX_TEX_ONE) |
+                                       A4XX_TEX_CONST_0_SWIZ_Y(A4XX_TEX_ONE) |
+                                       A4XX_TEX_CONST_0_SWIZ_Z(A4XX_TEX_ONE) |
+                                       A4XX_TEX_CONST_0_SWIZ_W(A4XX_TEX_ONE));
+                       OUT_RING(ring, A4XX_TEX_CONST_1_WIDTH(0) |
+                                       A4XX_TEX_CONST_1_HEIGHT(0));
+                       OUT_RING(ring, A4XX_TEX_CONST_2_PITCH(0));
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+                       OUT_RING(ring, 0x00000000);
+               }
+       }
+
+       OUT_PKT0(ring, REG_A4XX_RB_RENDER_COMPONENTS, 1);
+       OUT_RING(ring, A4XX_RB_RENDER_COMPONENTS_RT0(mrt_comp[0]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT1(mrt_comp[1]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT2(mrt_comp[2]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT3(mrt_comp[3]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT4(mrt_comp[4]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT5(mrt_comp[5]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT6(mrt_comp[6]) |
+                       A4XX_RB_RENDER_COMPONENTS_RT7(mrt_comp[7]));
 }
 
 void
@@ -255,27 +332,35 @@ fd4_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd4_emit *emit)
        unsigned instance_regid = regid(63, 0);
        unsigned vtxcnt_regid = regid(63, 0);
 
+       /* Note that sysvals come *after* normal inputs: */
        for (i = 0; i < vp->inputs_count; i++) {
-               uint8_t semantic = sem2name(vp->inputs[i].semantic);
-               if (semantic == TGSI_SEMANTIC_VERTEXID_NOBASE)
-                       vertex_regid = vp->inputs[i].regid;
-               else if (semantic == TGSI_SEMANTIC_INSTANCEID)
-                       instance_regid = vp->inputs[i].regid;
-               else if (semantic == IR3_SEMANTIC_VTXCNT)
-                       vtxcnt_regid = vp->inputs[i].regid;
-               else if ((i < vtx->vtx->num_elements) && vp->inputs[i].compmask)
+               if (!vp->inputs[i].compmask)
+                       continue;
+               if (vp->inputs[i].sysval) {
+                       switch(vp->inputs[i].slot) {
+                       case SYSTEM_VALUE_BASE_VERTEX:
+                               /* handled elsewhere */
+                               break;
+                       case SYSTEM_VALUE_VERTEX_ID_ZERO_BASE:
+                               vertex_regid = vp->inputs[i].regid;
+                               break;
+                       case SYSTEM_VALUE_INSTANCE_ID:
+                               instance_regid = vp->inputs[i].regid;
+                               break;
+                       case SYSTEM_VALUE_VERTEX_CNT:
+                               vtxcnt_regid = vp->inputs[i].regid;
+                               break;
+                       default:
+                               unreachable("invalid system value");
+                               break;
+                       }
+               } else if (i < vtx->vtx->num_elements) {
                        last = i;
+               }
        }
 
-       /* hw doesn't like to be configured for zero vbo's, it seems: */
-       if ((vtx->vtx->num_elements == 0) &&
-                       (vertex_regid == regid(63, 0)) &&
-                       (instance_regid == regid(63, 0)) &&
-                       (vtxcnt_regid == regid(63, 0)))
-               return;
-
        for (i = 0, j = 0; i <= last; i++) {
-               assert(sem2name(vp->inputs[i].semantic) == 0);
+               assert(!vp->inputs[i].sysval);
                if (vp->inputs[i].compmask) {
                        struct pipe_vertex_element *elem = &vtx->vtx->pipe[i];
                        const struct pipe_vertex_buffer *vb =
@@ -318,6 +403,38 @@ fd4_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd4_emit *emit)
                }
        }
 
+       /* hw doesn't like to be configured for zero vbo's, it seems: */
+       if (last < 0) {
+               /* just recycle the shader bo, we just need to point to *something*
+                * valid:
+                */
+               struct fd_bo *dummy_vbo = vp->bo;
+               bool switchnext = (vertex_regid != regid(63, 0)) ||
+                               (instance_regid != regid(63, 0)) ||
+                               (vtxcnt_regid != regid(63, 0));
+
+               OUT_PKT0(ring, REG_A4XX_VFD_FETCH(0), 4);
+               OUT_RING(ring, A4XX_VFD_FETCH_INSTR_0_FETCHSIZE(0) |
+                               A4XX_VFD_FETCH_INSTR_0_BUFSTRIDE(0) |
+                               COND(switchnext, A4XX_VFD_FETCH_INSTR_0_SWITCHNEXT));
+               OUT_RELOC(ring, dummy_vbo, 0, 0, 0);
+               OUT_RING(ring, A4XX_VFD_FETCH_INSTR_2_SIZE(1));
+               OUT_RING(ring, A4XX_VFD_FETCH_INSTR_3_STEPRATE(1));
+
+               OUT_PKT0(ring, REG_A4XX_VFD_DECODE_INSTR(0), 1);
+               OUT_RING(ring, A4XX_VFD_DECODE_INSTR_CONSTFILL |
+                               A4XX_VFD_DECODE_INSTR_WRITEMASK(0x1) |
+                               A4XX_VFD_DECODE_INSTR_FORMAT(VFMT4_8_UNORM) |
+                               A4XX_VFD_DECODE_INSTR_SWAP(XYZW) |
+                               A4XX_VFD_DECODE_INSTR_REGID(regid(0,0)) |
+                               A4XX_VFD_DECODE_INSTR_SHIFTCNT(1) |
+                               A4XX_VFD_DECODE_INSTR_LASTCOMPVALID |
+                               COND(switchnext, A4XX_VFD_DECODE_INSTR_SWITCHNEXT));
+
+               total_in = 1;
+               j = 1;
+       }
+
        OUT_PKT0(ring, REG_A4XX_VFD_CONTROL_0, 5);
        OUT_RING(ring, A4XX_VFD_CONTROL_0_TOTALATTRTOVS(total_in) |
                        0xa0000 | /* XXX */
@@ -348,6 +465,25 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
        emit_marker(ring, 5);
 
+       if ((dirty & FD_DIRTY_FRAMEBUFFER) && !emit->key.binning_pass) {
+               struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+               unsigned char mrt_comp[A4XX_MAX_RENDER_TARGETS] = {0};
+
+               for (unsigned i = 0; i < A4XX_MAX_RENDER_TARGETS; i++) {
+                       mrt_comp[i] = ((i < pfb->nr_cbufs) && pfb->cbufs[i]) ? 0xf : 0;
+               }
+
+               OUT_PKT0(ring, REG_A4XX_RB_RENDER_COMPONENTS, 1);
+               OUT_RING(ring, A4XX_RB_RENDER_COMPONENTS_RT0(mrt_comp[0]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT1(mrt_comp[1]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT2(mrt_comp[2]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT3(mrt_comp[3]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT4(mrt_comp[4]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT5(mrt_comp[5]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT6(mrt_comp[6]) |
+                               A4XX_RB_RENDER_COMPONENTS_RT7(mrt_comp[7]));
+       }
+
        if ((dirty & (FD_DIRTY_ZSA | FD_DIRTY_PROG)) && !emit->key.binning_pass) {
                uint32_t val = fd4_zsa_stateobj(ctx->zsa)->rb_render_control;
 
@@ -361,11 +497,16 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
                OUT_RINGP(ring, val, &fd4_context(ctx)->rbrc_patches);
        }
 
-       if (dirty & FD_DIRTY_ZSA) {
+       if (dirty & (FD_DIRTY_ZSA | FD_DIRTY_FRAMEBUFFER)) {
                struct fd4_zsa_stateobj *zsa = fd4_zsa_stateobj(ctx->zsa);
+               struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+               uint32_t rb_alpha_control = zsa->rb_alpha_control;
+
+               if (util_format_is_pure_integer(pipe_surface_format(pfb->cbufs[0])))
+                       rb_alpha_control &= ~A4XX_RB_ALPHA_CONTROL_ALPHA_TEST;
 
                OUT_PKT0(ring, REG_A4XX_RB_ALPHA_CONTROL, 1);
-               OUT_RING(ring, zsa->rb_alpha_control);
+               OUT_RING(ring, rb_alpha_control);
 
                OUT_PKT0(ring, REG_A4XX_RB_STENCIL_CONTROL, 2);
                OUT_RING(ring, zsa->rb_stencil_control);
@@ -389,14 +530,16 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
                OUT_PKT0(ring, REG_A4XX_RB_DEPTH_CONTROL, 1);
                OUT_RING(ring, zsa->rb_depth_control |
-                               COND(fragz, A4XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE));
+                               COND(fragz, A4XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE) |
+                               COND(fragz && fp->frag_coord, A4XX_RB_DEPTH_CONTROL_FORCE_FRAGZ_TO_FS));
 
                /* maybe this register/bitfield needs a better name.. this
                 * appears to be just disabling early-z
                 */
                OUT_PKT0(ring, REG_A4XX_GRAS_ALPHA_CONTROL, 1);
                OUT_RING(ring, zsa->gras_alpha_control |
-                               COND(fragz, A4XX_GRAS_ALPHA_CONTROL_ALPHA_TEST_ENABLE));
+                               COND(fragz, A4XX_GRAS_ALPHA_CONTROL_ALPHA_TEST_ENABLE) |
+                               COND(fragz && fp->frag_coord, A4XX_GRAS_ALPHA_CONTROL_FORCE_FRAGZ_TO_FS));
        }
 
        if (dirty & FD_DIRTY_RASTERIZER) {
@@ -426,8 +569,9 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
         */
        if (emit->info) {
                const struct pipe_draw_info *info = emit->info;
-               uint32_t val = fd4_rasterizer_stateobj(ctx->rasterizer)
-                               ->pc_prim_vtx_cntl;
+               struct fd4_rasterizer_stateobj *rast =
+                       fd4_rasterizer_stateobj(ctx->rasterizer);
+               uint32_t val = rast->pc_prim_vtx_cntl;
 
                if (info->indexed && info->primitive_restart)
                        val |= A4XX_PC_PRIM_VTX_CNTL_PRIMITIVE_RESTART;
@@ -443,7 +587,7 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
                OUT_PKT0(ring, REG_A4XX_PC_PRIM_VTX_CNTL, 2);
                OUT_RING(ring, val);
-               OUT_RING(ring, 0x12);     /* XXX UNKNOWN_21C5 */
+               OUT_RING(ring, rast->pc_prim_vtx_cntl2);
        }
 
        if (dirty & FD_DIRTY_SCISSOR) {
@@ -472,8 +616,10 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
                OUT_RING(ring, A4XX_GRAS_CL_VPORT_ZSCALE_0(ctx->viewport.scale[2]));
        }
 
-       if (dirty & FD_DIRTY_PROG)
-               fd4_program_emit(ring, emit);
+       if (dirty & (FD_DIRTY_PROG | FD_DIRTY_FRAMEBUFFER)) {
+               struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+               fd4_program_emit(ring, emit, pfb->nr_cbufs, pfb->cbufs);
+       }
 
        if (emit->prog == &ctx->prog) { /* evil hack to deal sanely with clear path */
                ir3_emit_consts(vp, ring, emit->info, dirty);
@@ -483,16 +629,35 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
                ctx->prog.dirty = 0;
        }
 
-       if ((dirty & FD_DIRTY_BLEND) && ctx->blend) {
+       if ((dirty & FD_DIRTY_BLEND)) {
                struct fd4_blend_stateobj *blend = fd4_blend_stateobj(ctx->blend);
                uint32_t i;
 
                for (i = 0; i < A4XX_MAX_RENDER_TARGETS; i++) {
+                       enum pipe_format format = pipe_surface_format(
+                                       ctx->framebuffer.cbufs[i]);
+                       bool is_int = util_format_is_pure_integer(format);
+                       bool has_alpha = util_format_has_alpha(format);
+                       uint32_t control = blend->rb_mrt[i].control;
+                       uint32_t blend_control = blend->rb_mrt[i].blend_control_alpha;
+
+                       if (is_int) {
+                               control &= A4XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK;
+                               control |= A4XX_RB_MRT_CONTROL_ROP_CODE(ROP_COPY);
+                       }
+
+                       if (has_alpha) {
+                               blend_control |= blend->rb_mrt[i].blend_control_rgb;
+                       } else {
+                               blend_control |= blend->rb_mrt[i].blend_control_no_alpha_rgb;
+                               control &= ~A4XX_RB_MRT_CONTROL_BLEND2;
+                       }
+
                        OUT_PKT0(ring, REG_A4XX_RB_MRT_CONTROL(i), 1);
-                       OUT_RING(ring, blend->rb_mrt[i].control);
+                       OUT_RING(ring, control);
 
                        OUT_PKT0(ring, REG_A4XX_RB_MRT_BLEND_CONTROL(i), 1);
-                       OUT_RING(ring, blend->rb_mrt[i].blend_control);
+                       OUT_RING(ring, blend_control);
                }
 
                OUT_PKT0(ring, REG_A4XX_RB_FS_OUTPUT, 1);
@@ -500,17 +665,50 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
                                A4XX_RB_FS_OUTPUT_SAMPLE_MASK(0xffff));
        }
 
-       if (dirty & FD_DIRTY_BLEND_COLOR) {
+       if (dirty & (FD_DIRTY_BLEND_COLOR | FD_DIRTY_FRAMEBUFFER)) {
                struct pipe_blend_color *bcolor = &ctx->blend_color;
-               OUT_PKT0(ring, REG_A4XX_RB_BLEND_RED, 4);
-               OUT_RING(ring, A4XX_RB_BLEND_RED_UINT(bcolor->color[0] * 255.0) |
+               struct pipe_framebuffer_state *pfb = &ctx->framebuffer;
+               float factor = 65535.0;
+               int i;
+
+               for (i = 0; i < pfb->nr_cbufs; i++) {
+                       enum pipe_format format = pipe_surface_format(pfb->cbufs[i]);
+                       const struct util_format_description *desc =
+                               util_format_description(format);
+                       int j;
+
+                       if (desc->is_mixed)
+                               continue;
+
+                       j = util_format_get_first_non_void_channel(format);
+                       if (j == -1)
+                               continue;
+
+                       if (desc->channel[j].size > 8 || !desc->channel[j].normalized ||
+                               desc->channel[j].pure_integer)
+                               continue;
+
+                       /* Just use the first unorm8/snorm8 render buffer. Can't keep
+                        * everyone happy.
+                        */
+                       if (desc->channel[j].type == UTIL_FORMAT_TYPE_SIGNED)
+                               factor = 32767.0;
+                       break;
+               }
+
+               OUT_PKT0(ring, REG_A4XX_RB_BLEND_RED, 8);
+               OUT_RING(ring, A4XX_RB_BLEND_RED_UINT(bcolor->color[0] * factor) |
                                A4XX_RB_BLEND_RED_FLOAT(bcolor->color[0]));
-               OUT_RING(ring, A4XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * 255.0) |
+               OUT_RING(ring, A4XX_RB_BLEND_RED_F32(bcolor->color[0]));
+               OUT_RING(ring, A4XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * factor) |
                                A4XX_RB_BLEND_GREEN_FLOAT(bcolor->color[1]));
-               OUT_RING(ring, A4XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * 255.0) |
+               OUT_RING(ring, A4XX_RB_BLEND_GREEN_F32(bcolor->color[1]));
+               OUT_RING(ring, A4XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * factor) |
                                A4XX_RB_BLEND_BLUE_FLOAT(bcolor->color[2]));
-               OUT_RING(ring, A4XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * 255.0) |
+               OUT_RING(ring, A4XX_RB_BLEND_BLUE_F32(bcolor->color[2]));
+               OUT_RING(ring, A4XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * factor) |
                                A4XX_RB_BLEND_ALPHA_FLOAT(bcolor->color[3]));
+               OUT_RING(ring, A4XX_RB_BLEND_ALPHA_F32(bcolor->color[3]));
        }
 
        if (dirty & FD_DIRTY_VERTTEX) {
@@ -588,15 +786,6 @@ fd4_emit_restore(struct fd_context *ctx)
        OUT_PKT0(ring, REG_A4XX_UNKNOWN_20EF, 1);
        OUT_RING(ring, 0x00000000);
 
-       OUT_PKT0(ring, REG_A4XX_UNKNOWN_20F0, 1);
-       OUT_RING(ring, 0x00000000);
-
-       OUT_PKT0(ring, REG_A4XX_UNKNOWN_20F1, 1);
-       OUT_RING(ring, 0x00000000);
-
-       OUT_PKT0(ring, REG_A4XX_UNKNOWN_20F2, 1);
-       OUT_RING(ring, 0x00000000);
-
        OUT_PKT0(ring, REG_A4XX_RB_BLEND_RED, 4);
        OUT_RING(ring, A4XX_RB_BLEND_RED_UINT(0) |
                        A4XX_RB_BLEND_RED_FLOAT(0.0));
@@ -607,9 +796,6 @@ fd4_emit_restore(struct fd_context *ctx)
        OUT_RING(ring, A4XX_RB_BLEND_ALPHA_UINT(0x7fff) |
                        A4XX_RB_BLEND_ALPHA_FLOAT(1.0));
 
-       OUT_PKT0(ring, REG_A4XX_UNKNOWN_20F7, 1);
-       OUT_RING(ring, 0x3f800000);
-
        OUT_PKT0(ring, REG_A4XX_UNKNOWN_2152, 1);
        OUT_RING(ring, 0x00000000);
 
@@ -690,9 +876,6 @@ fd4_emit_restore(struct fd_context *ctx)
        OUT_PKT0(ring, REG_A4XX_RB_FS_OUTPUT, 1);
        OUT_RING(ring, A4XX_RB_FS_OUTPUT_SAMPLE_MASK(0xffff));
 
-       OUT_PKT0(ring, REG_A4XX_RB_RENDER_COMPONENTS, 1);
-       OUT_RING(ring, A4XX_RB_RENDER_COMPONENTS_RT0(0xf));
-
        OUT_PKT0(ring, REG_A4XX_GRAS_CLEAR_CNTL, 1);
        OUT_RING(ring, A4XX_GRAS_CLEAR_CNTL_NOT_FASTCLEAR);