[Mesa-dev] [PATCH v2] ac: remove arrays when when querying sampler info

[Nicolai Hähnle]

On 19.01.2018 06:07, Timothy Arceri wrote:
> Fixes the following ARB_arrays_of_arrays piglit tests:
> 
> basic-imagestore-const-uniform-index
> basic-imagestore-mixed-const-non-const-uniform-index
> basic-imagestore-mixed-const-non-const-uniform-index2
> basic-imagestore-non-const-uniform-index

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


> ---
>   src/amd/common/ac_nir_to_llvm.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index 4f240db4ac..e88f64fb3b 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -3516,9 +3516,7 @@ static LLVMValueRef adjust_sample_index_using_fmask(struct ac_llvm_context *ctx,
>   static LLVMValueRef get_image_coords(struct ac_nir_context *ctx,
>   				     const nir_intrinsic_instr *instr)
>   {
> -	const struct glsl_type *type = instr->variables[0]->var->type;
> -	if(instr->variables[0]->deref.child)
> -		type = instr->variables[0]->deref.child->type;
> +	const struct glsl_type *type = glsl_without_array(instr->variables[0]->var->type);
>   
>   	LLVMValueRef src0 = get_src(ctx, instr->src[0]);
>   	LLVMValueRef coords[4];
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.