Mesa (master): radeonsi/nir: don't rely on data.patch for tess factors

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 268e42e4f8be8bc0560538808bbe5df2612d2377
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=268e42e4f8be8bc0560538808bbe5df2612d2377

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Nov  6 20:18:23 2019 -0500

radeonsi/nir: don't rely on data.patch for tess factors

GLCTS SPIR-V tests have this issue.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index b1ab398ba71..2be14857334 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1341,7 +1341,6 @@ static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
 	struct si_shader_context *ctx = si_shader_context_from_abi(abi);
 	struct tgsi_shader_info *info = &ctx->shader->selector->info;
 	const unsigned component = var->data.location_frac;
-	const bool is_patch = var->data.patch;
 	unsigned driver_location = var->data.driver_location;
 	LLVMValueRef dw_addr, stride;
 	LLVMValueRef buffer, base, addr;
@@ -1357,6 +1356,10 @@ static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
 	if (!param_index)
 		param_index = LLVMConstInt(ctx->i32, const_index, 0);
 
+	const bool is_patch = var->data.patch ||
+			      var->data.location == VARYING_SLOT_TESS_LEVEL_INNER ||
+			      var->data.location == VARYING_SLOT_TESS_LEVEL_OUTER;
+
 	assert((name == TGSI_SEMANTIC_PATCH ||
 		name == TGSI_SEMANTIC_TESSINNER ||
 		name == TGSI_SEMANTIC_TESSOUTER) == is_patch);