summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2018-01-11 14:56:07 +0100
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2018-01-15 11:59:16 +0100
commit5842cb0df1270cd347a12cc90be80354dc4d7c28 (patch)
tree9e6996c754a5895bd62e92b4106b0b87671d3bb1
parent5ba1a61648e2dea96f621a5886ad8b937a471ab4 (diff)
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@feralinteractive.com> Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
-rw-r--r--src/amd/common/ac_nir_to_llvm.c3
1 files changed, 1 insertions, 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 {