etnaviv: fix blend color on newer GPUs
Newer GPUs use the half float ALPHA_COLOR_EXT register. Signed-off-by: Jonathan Marek <jonathan@marek.ca> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
parent
5f73726013
commit
76adf041f2
|
@ -32,6 +32,7 @@
|
|||
#include "hw/common.xml.h"
|
||||
#include "pipe/p_defines.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_half.h"
|
||||
|
||||
void *
|
||||
etna_blend_state_create(struct pipe_context *pctx,
|
||||
|
@ -162,21 +163,20 @@ etna_update_blend_color(struct etna_context *ctx)
|
|||
{
|
||||
struct pipe_framebuffer_state *pfb = &ctx->framebuffer_s;
|
||||
struct compiled_blend_color *cs = &ctx->blend_color;
|
||||
bool rb_swap = (pfb->cbufs[0] && translate_rs_format_rb_swap(pfb->cbufs[0]->format));
|
||||
|
||||
if (pfb->cbufs[0] &&
|
||||
translate_rs_format_rb_swap(pfb->cbufs[0]->format)) {
|
||||
cs->PE_ALPHA_BLEND_COLOR =
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_R(etna_cfloat_to_uint8(cs->color[2])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_G(etna_cfloat_to_uint8(cs->color[1])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_B(etna_cfloat_to_uint8(cs->color[0])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_A(etna_cfloat_to_uint8(cs->color[3]));
|
||||
} else {
|
||||
cs->PE_ALPHA_BLEND_COLOR =
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_R(etna_cfloat_to_uint8(cs->color[0])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_G(etna_cfloat_to_uint8(cs->color[1])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_B(etna_cfloat_to_uint8(cs->color[2])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_A(etna_cfloat_to_uint8(cs->color[3]));
|
||||
}
|
||||
cs->PE_ALPHA_BLEND_COLOR =
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_R(etna_cfloat_to_uint8(cs->color[rb_swap ? 2 : 0])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_G(etna_cfloat_to_uint8(cs->color[1])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_B(etna_cfloat_to_uint8(cs->color[rb_swap ? 0 : 2])) |
|
||||
VIVS_PE_ALPHA_BLEND_COLOR_A(etna_cfloat_to_uint8(cs->color[3]));
|
||||
|
||||
cs->PE_ALPHA_COLOR_EXT0 =
|
||||
VIVS_PE_ALPHA_COLOR_EXT0_B(util_float_to_half(cs->color[rb_swap ? 2 : 0])) |
|
||||
VIVS_PE_ALPHA_COLOR_EXT0_G(util_float_to_half(cs->color[1]));
|
||||
cs->PE_ALPHA_COLOR_EXT1 =
|
||||
VIVS_PE_ALPHA_COLOR_EXT1_R(util_float_to_half(cs->color[rb_swap ? 0 : 2])) |
|
||||
VIVS_PE_ALPHA_COLOR_EXT1_A(util_float_to_half(cs->color[3]));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -342,8 +342,6 @@ etna_cmd_stream_reset_notify(struct etna_cmd_stream *stream, void *priv)
|
|||
etna_set_state(stream, VIVS_PA_VIEWPORT_UNK00A80, 0x38a01404);
|
||||
etna_set_state(stream, VIVS_PA_VIEWPORT_UNK00A84, fui(8192.0));
|
||||
etna_set_state(stream, VIVS_PA_ZFARCLIPPING, 0x00000000);
|
||||
etna_set_state(stream, VIVS_PE_ALPHA_COLOR_EXT0, 0x00000000);
|
||||
etna_set_state(stream, VIVS_PE_ALPHA_COLOR_EXT1, 0x00000000);
|
||||
etna_set_state(stream, VIVS_RA_HDEPTH_CONTROL, 0x00007000);
|
||||
etna_set_state(stream, VIVS_PE_STENCIL_CONFIG_EXT2, 0x00000000);
|
||||
etna_set_state(stream, VIVS_PS_CONTROL_EXT, 0x00000000);
|
||||
|
|
|
@ -531,10 +531,12 @@ etna_emit_state(struct etna_context *ctx)
|
|||
/*014A8*/ EMIT_STATE(PE_DITHER(x), blend->PE_DITHER[x]);
|
||||
}
|
||||
}
|
||||
|
||||
if (unlikely(dirty & (ETNA_DIRTY_BLEND_COLOR))) {
|
||||
/*014B0*/ EMIT_STATE(PE_ALPHA_COLOR_EXT0, ctx->blend_color.PE_ALPHA_COLOR_EXT0);
|
||||
/*014B4*/ EMIT_STATE(PE_ALPHA_COLOR_EXT1, ctx->blend_color.PE_ALPHA_COLOR_EXT1);
|
||||
}
|
||||
if (unlikely(dirty & (ETNA_DIRTY_FRAMEBUFFER)) && ctx->specs.halti >= 3)
|
||||
/*014BC*/ EMIT_STATE(PE_MEM_CONFIG, ctx->framebuffer.PE_MEM_CONFIG);
|
||||
|
||||
if (unlikely(dirty & (ETNA_DIRTY_FRAMEBUFFER | ETNA_DIRTY_TS))) {
|
||||
/*01654*/ EMIT_STATE(TS_MEM_CONFIG, ctx->framebuffer.TS_MEM_CONFIG);
|
||||
/*01658*/ EMIT_STATE_RELOC(TS_COLOR_STATUS_BASE, &ctx->framebuffer.TS_COLOR_STATUS_BASE);
|
||||
|
|
|
@ -146,6 +146,8 @@ struct etna_specs {
|
|||
struct compiled_blend_color {
|
||||
float color[4];
|
||||
uint32_t PE_ALPHA_BLEND_COLOR;
|
||||
uint32_t PE_ALPHA_COLOR_EXT0;
|
||||
uint32_t PE_ALPHA_COLOR_EXT1;
|
||||
};
|
||||
|
||||
/* Compiled pipe_stencil_ref */
|
||||
|
|
Loading…
Reference in New Issue