commit 9b4a1fb9d7417cc65c7a1c5979eed6b90a0b572b
author Iago Toral Quiroga <itoral@igalia.com> Wed Mar 04 09:29:28 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:28 2020 +0000
tree 8b0a10f975a07a6fd5f6a2ed972572dc2877f32b
parent fadccc1c59bfd87ec25cdd5ba6e953e5cda9dbfc

v3dv: assign driver locations on fragment shader output variables

We were getting driver location 0 on all output variables, which meant
that our color writes were always being redirected to render target 0.

Fixes dEQP-VK.pipeline.framebuffer_attachment.diff_* which uses multiple
render targets.

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

src/broadcom/vulkan/v3dv_pipeline.c

diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c
index 5b0ff85..662289b 100644
--- a/src/broadcom/vulkan/v3dv_pipeline.c
+++ b/src/broadcom/vulkan/v3dv_pipeline.c
@@ -446,6 +446,9 @@
 static void
 lower_fs_outputs(nir_shader *nir)
 {
+   nir_assign_io_var_locations(nir, nir_var_shader_out, &nir->num_outputs,
+                               MESA_SHADER_FRAGMENT);
+
    NIR_PASS_V(nir, nir_lower_io, nir_var_shader_out, type_size_vec4, 0);
 }