From a6e1178f917f73261940dee66cfba3e5211c29f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
Date: Tue, 9 Feb 2021 19:20:52 +0100
Subject: [PATCH] aco: Disallow LSHS temp-only I/O when VS output is written
 indirectly.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cc: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9100>
---
 src/amd/compiler/aco_instruction_selection_setup.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index a5dc75d1cd0..dd76403af57 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -459,8 +459,10 @@ setup_tcs_info(isel_context *ctx, nir_shader *nir, nir_shader *vs)
 
    if (ctx->tcs_in_out_eq) {
       ctx->tcs_temp_only_inputs = ~nir->info.tess.tcs_cross_invocation_inputs_read &
-                                    ~nir->info.inputs_read_indirectly &
-                                    nir->info.inputs_read;
+                                  ~nir->info.inputs_read_indirectly &
+                                  ~vs->info.outputs_accessed_indirectly &
+                                  nir->info.inputs_read &
+                                  vs->info.outputs_written;
    }
 
    ctx->tcs_num_inputs = ctx->program->info->tcs.num_linked_inputs;