Mesa (master): amd/common: fix loading InstanceID for tess on < GFX9

[Samuel Pitoiset]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Jan 11 14:56:07 2018 +0100

amd/common: fix loading InstanceID for tess on < GFX9

InstanceID is in VGPR2, not 1.

One more failure that CTS didn't catch up...

Reported-by: Alex Smith <asmith at feralinteractive.com>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/common/ac_nir_to_llvm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index cf7035edf1..d4c24342d7 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -6743,8 +6743,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
 			ctx.abi.load_patch_vertices_in = load_patch_vertices_in;
 		} else if (shaders[i]->info.stage == MESA_SHADER_VERTEX) {
 			if (shader_info->info.vs.needs_instance_id) {
-				if (ctx.ac.chip_class == GFX9 &&
-				    shaders[shader_count - 1]->info.stage == MESA_SHADER_TESS_CTRL) {
+				if (ctx.options->key.vs.as_ls) {
 					ctx.shader_info->vs.vgpr_comp_cnt =
 						MAX2(2, ctx.shader_info->vs.vgpr_comp_cnt);
 				} else {