From b36b6f76fa44b8bb2c379ccd83ad07ec4ddd2870 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Fri, 9 Jun 2017 15:16:51 +0200 Subject: [PATCH] ac/nir: add support for arrays-of-arrays to get_sampler_desc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/amd/common/ac_nir_to_llvm.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 6bf0845fee4..e6a4504418a 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4224,17 +4224,32 @@ static LLVMValueRef get_sampler_desc(struct ac_nir_context *ctx, { LLVMValueRef index = NULL; unsigned constant_index = 0; + const nir_deref *tail = &deref->deref; - if (deref->deref.child) { - const nir_deref_array *child = - (const nir_deref_array *)deref->deref.child; + while (tail->child) { + const nir_deref_array *child = nir_deref_as_array(tail->child); + unsigned array_size = glsl_get_aoa_size(tail->child->type); + + if (!array_size) + array_size = 1; assert(child->deref_array_type != nir_deref_array_type_wildcard); + if (child->deref_array_type == nir_deref_array_type_indirect) { - index = get_src(ctx, child->indirect); + LLVMValueRef indirect = get_src(ctx, child->indirect); + + indirect = LLVMBuildMul(ctx->ac.builder, indirect, + LLVMConstInt(ctx->ac.i32, array_size, false), ""); + + if (!index) + index = indirect; + else + index = LLVMBuildAdd(ctx->ac.builder, index, indirect, ""); } - constant_index = child->base_offset; + constant_index += child->base_offset * array_size; + + tail = &child->deref; } return ctx->abi->load_sampler_desc(ctx->abi, -- 2.30.2