From 15e9704ccb1ebc60a41f9d56c9f129547bc9a529 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Mon, 12 Aug 2019 14:19:59 -0400 Subject: [PATCH] etnaviv: set output mode and saturate bits Signed-off-by: Jonathan Marek Reviewed-by: Christian Gmeiner --- src/gallium/drivers/etnaviv/etnaviv_emit.c | 3 ++- .../drivers/etnaviv/etnaviv_internal.h | 3 ++- src/gallium/drivers/etnaviv/etnaviv_shader.c | 1 - src/gallium/drivers/etnaviv/etnaviv_state.c | 4 ++++ .../drivers/etnaviv/etnaviv_translate.h | 22 +++++++++++++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_emit.c b/src/gallium/drivers/etnaviv/etnaviv_emit.c index ba3d8c021e7..25431477a7a 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_emit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_emit.c @@ -449,7 +449,8 @@ etna_emit_state(struct etna_context *ctx) ctx->framebuffer.msaa_mode ? ctx->shader_state.PS_TEMP_REGISTER_CONTROL_MSAA : ctx->shader_state.PS_TEMP_REGISTER_CONTROL); - /*01010*/ EMIT_STATE(PS_CONTROL, ctx->shader_state.PS_CONTROL); + /*01010*/ EMIT_STATE(PS_CONTROL, ctx->framebuffer.PS_CONTROL); + /*01030*/ EMIT_STATE(PS_CONTROL_EXT, ctx->framebuffer.PS_CONTROL_EXT); } if (unlikely(dirty & (ETNA_DIRTY_ZSA | ETNA_DIRTY_FRAMEBUFFER | ETNA_DIRTY_SHADER))) { /*01400*/ EMIT_STATE(PE_DEPTH_CONFIG, (etna_zsa_state(ctx->zsa)->PE_DEPTH_CONFIG | diff --git a/src/gallium/drivers/etnaviv/etnaviv_internal.h b/src/gallium/drivers/etnaviv/etnaviv_internal.h index 8655eac53c3..fcad76513d9 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_internal.h +++ b/src/gallium/drivers/etnaviv/etnaviv_internal.h @@ -216,6 +216,8 @@ struct compiled_framebuffer_state { struct etna_reloc TS_COLOR_STATUS_BASE; struct etna_reloc TS_COLOR_SURFACE_BASE; uint32_t PE_LOGIC_OP; + uint32_t PS_CONTROL; + uint32_t PS_CONTROL_EXT; bool msaa_mode; /* adds input (and possible temp) to PS */ }; @@ -256,7 +258,6 @@ struct compiled_shader_state { uint32_t PS_INPUT_COUNT_MSAA; /* Adds an input */ uint32_t PS_TEMP_REGISTER_CONTROL; uint32_t PS_TEMP_REGISTER_CONTROL_MSAA; /* Adds a temporary if needed to make space for extra input */ - uint32_t PS_CONTROL; uint32_t PS_START_PC; uint32_t PE_DEPTH_CONFIG; uint32_t GL_VARYING_TOTAL_COMPONENTS; diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c index 72796065fb6..0415538e287 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_shader.c +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c @@ -165,7 +165,6 @@ etna_link_shaders(struct etna_context *ctx, struct compiled_shader_state *cs, VIVS_PS_INPUT_COUNT_UNK8(fs->input_count_unk8); cs->PS_TEMP_REGISTER_CONTROL = VIVS_PS_TEMP_REGISTER_CONTROL_NUM_TEMPS(MAX2(fs->num_temps, link.num_varyings + 1)); - cs->PS_CONTROL = VIVS_PS_CONTROL_SATURATE_RT0; /* XXX when can we set BYPASS? */ cs->PS_START_PC = 0; /* Precompute PS_INPUT_COUNT and TEMP_REGISTER_CONTROL in the case of MSAA diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index 314bd355c09..cf44a7ea124 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -213,6 +213,10 @@ etna_set_framebuffer_state(struct pipe_context *pctx, if (util_format_is_srgb(cbuf->base.format)) pe_logic_op |= VIVS_PE_LOGIC_OP_SRGB; + + cs->PS_CONTROL = COND(util_format_is_unorm(cbuf->base.format), VIVS_PS_CONTROL_SATURATE_RT0); + cs->PS_CONTROL_EXT = + VIVS_PS_CONTROL_EXT_OUTPUT_MODE0(translate_output_mode(cbuf->base.format, ctx->specs.halti >= 5)); } else { /* Clearing VIVS_PE_COLOR_FORMAT_COMPONENTS__MASK and * VIVS_PE_COLOR_FORMAT_OVERWRITE prevents us from overwriting the diff --git a/src/gallium/drivers/etnaviv/etnaviv_translate.h b/src/gallium/drivers/etnaviv/etnaviv_translate.h index 6c367d7ed8b..e0811545e74 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_translate.h +++ b/src/gallium/drivers/etnaviv/etnaviv_translate.h @@ -306,6 +306,28 @@ translate_vertex_format_normalize(enum pipe_format fmt) : VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE_OFF; } +static inline uint32_t +translate_output_mode(enum pipe_format fmt, bool halti5) +{ + const unsigned bits = + util_format_get_component_bits(fmt, UTIL_FORMAT_COLORSPACE_RGB, 0); + + if (bits == 32) + return COLOR_OUTPUT_MODE_UIF32; + + if (!util_format_is_pure_integer(fmt)) + return COLOR_OUTPUT_MODE_NORMAL; + + /* generic integer output mode pre-halti5 (?) */ + if (bits == 10 || !halti5) + return COLOR_OUTPUT_MODE_A2B10G10R10UI; + + if (util_format_is_pure_sint(fmt)) + return bits == 8 ? COLOR_OUTPUT_MODE_I8 : COLOR_OUTPUT_MODE_I16; + + return bits == 8 ? COLOR_OUTPUT_MODE_U8 : COLOR_OUTPUT_MODE_U16; +} + static inline uint32_t translate_index_size(unsigned index_size) { -- 2.30.2