diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2020-03-13 20:48:27 +0100 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2020-03-17 22:53:16 +0100 |
| commit | 8e4e2cedcf53d0f9649d51fc3acccaada96172bb (patch) | |
| tree | 5accc9967ed59652acf74afd2fd5adab918374a7 /src/amd/llvm | |
| parent | 040ce9a1b3b596d34e224cf3be42747bdadc7163 (diff) | |
amd/llvm: Fix divergent descriptor regressions with radeonsi.
piglit/bin/arb_bindless_texture-limit -auto -fbo:
Needed to deal with non-NULL dynamic_index without deref in tex instructions.
piglit/bin/shader_runner tests/spec/arb_bindless_texture/execution/images/multiple-resident-images-reading.shader_test -auto:
Need to deal with non-deref images in enter_waterfall_imae.
Fixes: b83c9aca4a5 "amd/llvm: Fix divergent descriptor indexing. (v3)"
Acked-by: Marek Olšák <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4191>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4191>
Diffstat (limited to 'src/amd/llvm')
| -rw-r--r-- | src/amd/llvm/ac_nir_to_llvm.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index fec68c46913..49627990163 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -2706,7 +2706,11 @@ static LLVMValueRef enter_waterfall_image(struct ac_nir_context *ctx, struct waterfall_context *wctx, const nir_intrinsic_instr *instr) { - nir_deref_instr *deref_instr = nir_instr_as_deref(instr->src[0].ssa->parent_instr); + nir_deref_instr *deref_instr = NULL; + + if (instr->src[0].ssa->parent_instr->type == nir_instr_type_deref) + deref_instr = nir_instr_as_deref(instr->src[0].ssa->parent_instr); + LLVMValueRef value = get_sampler_desc_index(ctx, deref_instr, &instr->instr, true); return enter_waterfall(ctx, wctx, value, nir_intrinsic_access(instr) & ACCESS_NON_UNIFORM); } @@ -4282,20 +4286,18 @@ static void tex_fetch_ptrs(struct ac_nir_context *ctx, } } + LLVMValueRef texture_dynamic_index = get_sampler_desc_index(ctx, texture_deref_instr, + &instr->instr, false); if (!sampler_deref_instr) sampler_deref_instr = texture_deref_instr; - LLVMValueRef texture_dynamic_index = NULL, sampler_dynamic_index = NULL; - if (texture_deref_instr) { - texture_dynamic_index = get_sampler_desc_index(ctx, texture_deref_instr, &instr->instr, false); - texture_dynamic_index = enter_waterfall(ctx, wctx + 0, texture_dynamic_index, instr->texture_non_uniform); - } + LLVMValueRef sampler_dynamic_index = get_sampler_desc_index(ctx, sampler_deref_instr, + &instr->instr, false); + if (instr->texture_non_uniform) + texture_dynamic_index = enter_waterfall(ctx, wctx + 0, texture_dynamic_index, true); - if (sampler_deref_instr && sampler_deref_instr != texture_deref_instr) { - sampler_dynamic_index = get_sampler_desc_index(ctx, sampler_deref_instr, &instr->instr, false); - sampler_dynamic_index = enter_waterfall(ctx, wctx + 1, sampler_dynamic_index, instr->sampler_non_uniform); - } else - sampler_dynamic_index = texture_dynamic_index; + if (instr->sampler_non_uniform) + sampler_dynamic_index = enter_waterfall(ctx, wctx + 1, sampler_dynamic_index, true); enum ac_descriptor_type main_descriptor = instr->sampler_dim == GLSL_SAMPLER_DIM_BUF ? AC_DESC_BUFFER : AC_DESC_IMAGE; |