From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Wed, 9 Jan 2019 04:03:36 +0000 (+1100)
Subject: ac/nir_to_llvm: fix regression in bindless support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b12316cc925a7659d5edf62d62b8d7987fe7a657;p=mesa.git

ac/nir_to_llvm: fix regression in bindless support

This wasn't ported over when deref support was implemented.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index e0c6b0968f0..a2069ebb44f 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3305,7 +3305,12 @@ static LLVMValueRef get_sampler_desc(struct ac_nir_context *ctx,
 			deref_instr = nir_src_as_deref(deref_instr->parent);
 		}
 		descriptor_set = deref_instr->var->data.descriptor_set;
-		base_index = deref_instr->var->data.binding;
+
+		if (deref_instr->var->data.bindless) {
+			base_index = deref_instr->var->data.driver_location;
+			bindless = true;
+		} else
+			base_index = deref_instr->var->data.binding;
 	}
 
 	return ctx->abi->load_sampler_desc(ctx->abi,