Mesa (master): freedreno/a6xx: Fix clip_halfz support.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jun 10 11:28:03 2020 -0700

freedreno/a6xx: Fix clip_halfz support.

Same bit as on other gens, apparently it just got missed on this one.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5419>

---

 .gitlab-ci/deqp-freedreno-a630-fails.txt            | 1 -
 src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt
index 22ffe17093b..30ec504bb9a 100644
--- a/.gitlab-ci/deqp-freedreno-a630-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt
@@ -1,5 +1,4 @@
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z
-dEQP-GLES2.functional.clip_control.depth_mode_zero_to_one
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw
 dEQP-VK.compute.indirect_dispatch.upload_buffer.multiple_groups
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
index 2225ea0b2eb..91ac776480e 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.c
@@ -52,7 +52,10 @@ __fd6_setup_rasterizer_stateobj(struct fd_context *ctx,
 	}
 
 	OUT_REG(ring,
-		A6XX_GRAS_CL_CNTL(.vp_clip_code_ignore = 1),
+		A6XX_GRAS_CL_CNTL(
+			.vp_clip_code_ignore = 1,
+			.zero_gb_scale_z = cso->clip_halfz
+			),
 		A6XX_GRAS_UNKNOWN_8001());
 
 	OUT_REG(ring,