Mesa (staging/19.2): etnaviv: fix depth bias
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 31 16:04:01 UTC 2019
Module: Mesa
Branch: staging/19.2
Commit: 49e105048b43b29bceb223cc9099badfa2752a26
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49e105048b43b29bceb223cc9099badfa2752a26
Author: Jonathan Marek <jonathan at marek.ca>
Date: Mon Sep 2 14:46:15 2019 -0400
etnaviv: fix depth bias
Fixes remaining failures in these deqp tests (tested on GC3000/GC7000L):
dEQP-GLES2.functional.polygon_offset.*
Fixes: 6c3c05dc ("etnaviv: fix polygon offset")
Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
(cherry picked from commit 7b524e1acbe7d704a9920302529a0e02e8ef9a55)
---
src/gallium/drivers/etnaviv/etnaviv_rasterizer.c | 2 +-
src/gallium/drivers/etnaviv/etnaviv_state.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c b/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c
index b782e120537..2f218d6c063 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_rasterizer.c
@@ -56,7 +56,7 @@ etna_rasterizer_state_create(struct pipe_context *pctx,
cs->PA_LINE_WIDTH = fui(so->line_width / 2.0f);
cs->PA_POINT_SIZE = fui(so->point_size / 2.0f);
cs->SE_DEPTH_SCALE = fui(so->offset_scale);
- cs->SE_DEPTH_BIAS = fui(so->offset_units);
+ cs->SE_DEPTH_BIAS = fui((so->offset_units / 65535.0f) * 2.0f);
cs->SE_CONFIG = COND(so->line_last_pixel, VIVS_SE_CONFIG_LAST_PIXEL_ENABLE);
/* XXX anything else? */
/* XXX bottom_edge_rule */
diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c
index 4884865e78d..84fc9f88aad 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_state.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_state.c
@@ -226,6 +226,7 @@ etna_set_framebuffer_state(struct pipe_context *pctx,
depth_format |
COND(depth_supertiled, VIVS_PE_DEPTH_CONFIG_SUPER_TILED) |
VIVS_PE_DEPTH_CONFIG_DEPTH_MODE_Z |
+ VIVS_PE_DEPTH_CONFIG_UNK18 | /* something to do with clipping? */
COND(ctx->specs.halti >= 5, VIVS_PE_DEPTH_CONFIG_DISABLE_ZS) /* Needs to be enabled on GC7000, otherwise depth writes hang w/ TS - apparently it does something else now */
;
/* VIVS_PE_DEPTH_CONFIG_ONLY_DEPTH */
More information about the mesa-commit
mailing list