freedreno/a4xx: fix blend color
authorRob Clark <robclark@freedesktop.org>
Tue, 27 Oct 2015 15:38:34 +0000 (11:38 -0400)
committerRob Clark <robclark@freedesktop.org>
Fri, 6 Nov 2015 16:19:04 +0000 (11:19 -0500)
Signed-off-by: Rob Clark <robclark@freedesktop.org>
src/gallium/drivers/freedreno/a4xx/fd4_emit.c

index 848a82fee7eaf89a1f3b7171bdb5cb30099dd861..26b58718cd8bc72673e9ffd55432cb9be18ee353 100644 (file)
@@ -613,15 +613,19 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
        if (dirty & FD_DIRTY_BLEND_COLOR) {
                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) |
+               OUT_PKT0(ring, REG_A4XX_RB_BLEND_RED, 8);
+               OUT_RING(ring, A4XX_RB_BLEND_RED_UINT(bcolor->color[0] * 65535.0) |
                                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] * 65535.0) |
                                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] * 65535.0) |
                                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] * 65535.0) |
                                A4XX_RB_BLEND_ALPHA_FLOAT(bcolor->color[3]));
+               OUT_RING(ring, A4XX_RB_BLEND_ALPHA_F32(bcolor->color[3]));
        }
 
        if (dirty & FD_DIRTY_VERTTEX) {