diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2018-01-19 15:51:15 +1100 |
|---|---|---|
| committer | Timothy Arceri <tarceri@itsqueeze.com> | 2018-01-23 09:50:47 +1100 |
| commit | 209b14c2cb99aae13f5c547fb2be5ed6607feef8 (patch) | |
| tree | 1087a0dd5be172a694d15daa2cd363c414586a5f | |
| parent | 0cbc62a4dd92d1585aa14bf115d966deac07948e (diff) | |
ac: remove arrays when when querying sampler info
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@amd.com>
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 53f5782eac5..214fb148a11 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3518,9 +3518,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]; |