fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/u_blitter: Fix depth.

Browse source 
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: 26c6640835
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16929>
(cherry picked from commit 810135fb42)

Conflicts:
	src/gallium/drivers/lima/ci/lima-fails.txt
This commit is contained in:
Timur Kristóf 2022-06-08 20:13:24 +02:00 • committed by Dylan Baker
parent 86811cc178
commit 839cd82865
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1093,7 +1093,7 @@
"description": "gallium/u_blitter: Fix depth.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "26c6640835936a77d87030ce8e90f9b9f5be783e"
},

7
src/gallium/auxiliary/util/u_blitter.c
View file

@ -846,14 +846,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;

1
src/gallium/drivers/lima/ci/lima-fails.txt
View file

@ -124,7 +124,6 @@ spec@arb_texture_cube_map@cubemap,Fail
spec@arb_texture_cube_map@cubemap npot,Fail
spec@arb_texture_cube_map@cubemap-shader,Fail
spec@arb_texture_rectangle@1-1-linear-texture,Fail
spec@arb_texture_rectangle@copyteximage rect,Fail
spec@arb_texture_rectangle@copyteximage rect samples=2,Fail
spec@arb_texture_rectangle@copyteximage rect samples=4,Fail
spec@arb_texture_rectangle@glsl-fs-shadow2drect-01,Fail