Module: Mesa Branch: staging/20.0 Commit: 5cd2b945df2ee45a83218211683aaab5201b6c2c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cd2b945df2ee45a83218211683aaab5201b6c2c
Author: Samuel Pitoiset <[email protected]> Date: Wed Apr 15 08:37:40 2020 +0200 radv/llvm: fix exporting the viewport index if the fragment shader needs it It's like the layer, it has to be exported via the pos and also as a varying if the fragment shader reads it. Fixes dEQP-VK.draw.shader_viewport_index.fragment_shader_* Cc: <[email protected]> Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4564> (cherry picked from commit b424d49ac05563fd7d9f217fae9c25fc602f4330) --- .pick_status.json | 2 +- src/amd/vulkan/radv_nir_to_llvm.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c7c9c5ff651..14cdf1ccf0a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -832,7 +832,7 @@ "description": "radv/llvm: fix exporting the viewport index if the fragment shader needs it", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 6451691da6e..64288be58bb 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -1889,6 +1889,7 @@ radv_build_param_exports(struct radv_shader_context *ctx, if (slot_name != VARYING_SLOT_LAYER && slot_name != VARYING_SLOT_PRIMITIVE_ID && + slot_name != VARYING_SLOT_VIEWPORT && slot_name != VARYING_SLOT_CLIP_DIST0 && slot_name != VARYING_SLOT_CLIP_DIST1 && slot_name < VARYING_SLOT_VAR0) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
