summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2019-01-09 15:03:36 +1100
committerTimothy Arceri <[email protected]>2019-01-17 10:35:36 +1100
commitb12316cc925a7659d5edf62d62b8d7987fe7a657 (patch)
tree5bf2a07dbcfcf66eba2ee3e89510c01356b6e4fb
parente106e0f2dd6d80554c70cbba32e8e196bf1186ec (diff)
ac/nir_to_llvm: fix regression in bindless support
This wasn't ported over when deref support was implemented. Reviewed-by: Marek Olšák <[email protected]>
-rw-r--r--src/amd/common/ac_nir_to_llvm.c7
1 files changed, 6 insertions, 1 deletions
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,