diff options
| author | Rob Clark <robclark@freedesktop.org> | 2016-04-22 14:44:53 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2016-04-22 15:00:34 -0400 |
| commit | e85bef8b128eef7ae549a95bac197601435da9cd (patch) | |
| tree | 5052342442f0265e8ee3fc6df1a4eb7f39da6a5f /src/gallium/drivers/freedreno/a4xx | |
| parent | 23abc41d2becd13d2ac2bc3c5da853b8a2319370 (diff) | |
| download | external_mesa3d-e85bef8b128eef7ae549a95bac197601435da9cd.tar.gz external_mesa3d-e85bef8b128eef7ae549a95bac197601435da9cd.tar.bz2 external_mesa3d-e85bef8b128eef7ae549a95bac197601435da9cd.zip | |
freedreno/a4xx: fix encoding of blend color state
Fixes a whole bunch of dEQP-GLES3.functional.fragment_ops.random.* (now
they all pass)
Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/gallium/drivers/freedreno/a4xx')
| -rw-r--r-- | src/gallium/drivers/freedreno/a4xx/fd4_emit.c | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c index e984d9bb64..dbb9ad21a1 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c @@ -660,46 +660,25 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring, if (dirty & (FD_DIRTY_BLEND_COLOR | FD_DIRTY_FRAMEBUFFER)) { struct pipe_blend_color *bcolor = &ctx->blend_color; 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; - } + /* TODO make this a state obj? */ 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_RED_FLOAT(bcolor->color[0]) | + A4XX_RB_BLEND_RED_UINT(bcolor->color[0] * 0xff) | + A4XX_RB_BLEND_RED_SINT(bcolor->color[0] * 0x7f)); 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_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_GREEN_FLOAT(bcolor->color[1]) | + A4XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * 0xff) | + A4XX_RB_BLEND_GREEN_SINT(bcolor->color[1] * 0x7f)); + OUT_RING(ring, A4XX_RB_BLEND_RED_F32(bcolor->color[1])); + OUT_RING(ring, A4XX_RB_BLEND_BLUE_FLOAT(bcolor->color[2]) | + A4XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * 0xff) | + A4XX_RB_BLEND_BLUE_SINT(bcolor->color[2] * 0x7f)); 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_FLOAT(bcolor->color[3]) | + A4XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * 0xff) | + A4XX_RB_BLEND_ALPHA_SINT(bcolor->color[3] * 0x7f)); OUT_RING(ring, A4XX_RB_BLEND_ALPHA_F32(bcolor->color[3])); } |