commit db629c0f4b0b1e09e1cf29e9eb5ca14c8cf9436c
author Iago Toral Quiroga <itoral@igalia.com> Thu Mar 12 09:06:16 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:28 2020 +0000
tree 25d31a08d89e2ac81913f384b9866c83763d24d3
parent 57f5fa08cbb9bdbdd2643e4a99e9eaaeb5f83017

v3dv: fix viewport Z

Vulkan has Z NDC range in [0, 1], we where using OpenGL's [-1, 1].

Fixes:
dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltasmall
dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltaone

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

src/broadcom/vulkan/v3dv_cmd_buffer.c

diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index 68d468d..511dceb 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -1899,8 +1899,9 @@
       clip.viewport_z_scale_zc_to_zs = vpscale[2];
    }
    cl_emit(&job->bcl, CLIPPER_Z_MIN_MAX_CLIPPING_PLANES, clip) {
-      float z1 = (vptranslate[2] - vpscale[2]);
-      float z2 = (vptranslate[2] + vpscale[2]);
+      /* Vulkan's Z NDC is [0..1], unlile OpenGL which is [-1, 1] */
+      float z1 = vptranslate[2];
+      float z2 = vptranslate[2] + vpscale[2];
       clip.minimum_zw = MIN2(z1, z2);
       clip.maximum_zw = MAX2(z1, z2);
    }