Mesa (main): gallium/u_blitter: Fix depth.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 810135fb428a2505eba490b4d17a33629820e4e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=810135fb428a2505eba490b4d17a33629820e4e5

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Wed Jun  8 20:13:24 2022 +0200

gallium/u_blitter: Fix depth.

Fix the transform to make sure it doesn't disturb the depth range
of the blitted image. Set the Z coordinates of the vertices
by hand instead of relying on the transform to do it.

This is a pre-requisite to Zink always enabling depth clamping.

Fixes: 26c6640835936a77d87030ce8e90f9b9f5be783e
Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16929>

---

 src/gallium/auxiliary/util/u_blitter.c     | 7 +++++--
 src/gallium/drivers/lima/ci/lima-fails.txt | 3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index f55c580fec7..0e9a7837722 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -844,14 +844,17 @@ static void blitter_set_rectangle(struct blitter_context_priv *ctx,
    ctx->vertices[3][0][0] = (float)x1 / ctx->dst_width * 2.0f - 1.0f; /*v3.x*/
    ctx->vertices[3][0][1] = (float)y2 / ctx->dst_height * 2.0f - 1.0f; /*v3.y*/
 
+   for (unsigned i = 0; i < 4; ++i)
+      ctx->vertices[i][0][2] = depth;
+
    /* viewport */
    struct pipe_viewport_state viewport;
    viewport.scale[0] = 0.5f * ctx->dst_width;
    viewport.scale[1] = 0.5f * ctx->dst_height;
-   viewport.scale[2] = 0.0f;
+   viewport.scale[2] = 1.0f;
    viewport.translate[0] = 0.5f * ctx->dst_width;
    viewport.translate[1] = 0.5f * ctx->dst_height;
-   viewport.translate[2] = depth;
+   viewport.translate[2] = 0.0f;
    viewport.swizzle_x = PIPE_VIEWPORT_SWIZZLE_POSITIVE_X;
    viewport.swizzle_y = PIPE_VIEWPORT_SWIZZLE_POSITIVE_Y;
    viewport.swizzle_z = PIPE_VIEWPORT_SWIZZLE_POSITIVE_Z;
diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt
index d8f83aafc38..de8ae03d26e 100644
--- a/src/gallium/drivers/lima/ci/lima-fails.txt
+++ b/src/gallium/drivers/lima/ci/lima-fails.txt
@@ -125,7 +125,6 @@ spec at arb_texture_cube_map@cubemap,Fail
 spec at arb_texture_cube_map@cubemap npot,Fail
 spec at arb_texture_cube_map@cubemap-shader,Fail
 spec at arb_texture_rectangle@1-1-linear-texture,Fail
-spec at arb_texture_rectangle@copyteximage rect,Fail
 spec at arb_texture_rectangle@copyteximage rect samples=2,Fail
 spec at arb_texture_rectangle@copyteximage rect samples=4,Fail
 spec at arb_texture_rectangle@glsl-fs-shadow2drect-01,Fail
@@ -573,8 +572,6 @@ spec@!opengl 1.0 at gl-1.0-scissor-bitmap,Fail
 spec@!opengl 1.0 at gl-1.0-spot-light,Fail
 spec@!opengl 1.0 at gl-1.0-swapbuffers-behavior,Fail
 spec@!opengl 1.0 at gl-1.0-user-clip-all-planes,Fail
-spec@!opengl 1.1 at copyteximage 1d,Fail
-spec@!opengl 1.1 at copyteximage 2d,Fail
 spec@!opengl 1.1 at gl-1.1-xor-copypixels,Fail
 spec@!opengl 1.1 at gl-1.1-xor,Fail
 spec@!opengl 1.1 at line-flat-clip-color,Fail