Module: Mesa
Branch: master
Commit: 6459e780ae44d8826322e0dc2466d0ee6d9e9800
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6459e780ae44d8826322e0dc2466d0ee6d9e9800

Author: Rob Clark <[email protected]>
Date:   Tue Oct 27 11:38:34 2015 -0400

freedreno/a4xx: fix blend color

Signed-off-by: Rob Clark <[email protected]>

---

 src/gallium/drivers/freedreno/a4xx/fd4_emit.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c 
b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index 848a82f..26b5871 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -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) {

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to