Mesa (main): radv: Better exclude special MS outputs from driver location assignment.

[GitLab Mirror]

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

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Fri Jan 21 18:05:54 2022 +0100

radv: Better exclude special MS outputs from driver location assignment.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15034>

---

 src/amd/vulkan/radv_pipeline.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 71f01ea1710..465a5791f81 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2738,10 +2738,12 @@ radv_set_driver_locations(struct radv_pipeline *pipeline, nir_shader **shaders,
       /* Mesh shader output driver locations are set separately for per-vertex
        * and per-primitive outputs, because they are stored in separate LDS regions.
        */
-      uint64_t per_vertex_mask = ms->info.outputs_written & ~ms->info.per_primitive_outputs
-                                 & ~BITFIELD64_BIT(VARYING_SLOT_PRIMITIVE_COUNT)
-                                 & ~BITFIELD64_BIT(VARYING_SLOT_PRIMITIVE_INDICES);
-      uint64_t per_primitive_mask = ms->info.per_primitive_outputs & ms->info.outputs_written;
+      uint64_t special_mask = BITFIELD64_BIT(VARYING_SLOT_PRIMITIVE_COUNT) |
+                              BITFIELD64_BIT(VARYING_SLOT_PRIMITIVE_INDICES);
+      uint64_t per_vertex_mask =
+         ms->info.outputs_written & ~ms->info.per_primitive_outputs & ~special_mask;
+      uint64_t per_primitive_mask =
+         ms->info.per_primitive_outputs & ms->info.outputs_written & ~special_mask;
 
       nir_foreach_shader_out_variable(var, shaders[MESA_SHADER_MESH])
       {