From f9a58444459e630fcab11eb1f0b3412a00545b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= Date: Wed, 13 Sep 2017 10:47:02 +0200 Subject: [PATCH] amd/common: round cube array slice in ac_prepare_cube_coords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NIR-to-LLVM pass already does this; now the same fix covers radeonsi as well. Fixes various tests of dEQP-GLES31.functional.texture.filtering.cube_array.combinations.* Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Marek Olšák Reviewed-by: Dave Airlie (cherry picked from commit e0af3bed2cb52b5d8cf1da08b42cf28bae131c76) [Juan A. Suarez: resolve trivial conflicts. Apply patch into si_shader.c] Signed-off-by: Juan A. Suarez Romero Conflicts: src/amd/common/ac_nir_to_llvm.c src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c --- src/amd/common/ac_llvm_build.c | 7 ++++++- src/amd/common/ac_llvm_build.h | 2 +- src/amd/common/ac_nir_to_llvm.c | 4 +--- src/gallium/drivers/radeonsi/si_shader.c | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c index d45094c8624..e2707e3b53d 100644 --- a/src/amd/common/ac_llvm_build.c +++ b/src/amd/common/ac_llvm_build.c @@ -327,7 +327,7 @@ static void build_cube_select(LLVMBuilderRef builder, void ac_prepare_cube_coords(struct ac_llvm_context *ctx, - bool is_deriv, bool is_array, + bool is_deriv, bool is_array, bool is_lod, LLVMValueRef *coords_arg, LLVMValueRef *derivs_arg) { @@ -337,6 +337,11 @@ ac_prepare_cube_coords(struct ac_llvm_context *ctx, LLVMValueRef coords[3]; LLVMValueRef invma; + if (is_array && !is_lod) { + coords_arg[3] = ac_build_intrinsic(ctx, "llvm.rint.f32", ctx->f32, + &coords_arg[3], 1, 0); + } + build_cube_intrinsic(ctx, coords_arg, &selcoords); invma = ac_build_intrinsic(ctx, "llvm.fabs.f32", diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h index d6edcded331..7b4095058ac 100644 --- a/src/amd/common/ac_llvm_build.h +++ b/src/amd/common/ac_llvm_build.h @@ -82,7 +82,7 @@ ac_build_fdiv(struct ac_llvm_context *ctx, void ac_prepare_cube_coords(struct ac_llvm_context *ctx, - bool is_deriv, bool is_array, + bool is_deriv, bool is_array, bool is_lod, LLVMValueRef *coords_arg, LLVMValueRef *derivs_arg); diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index e3ada437ced..ab2d8025317 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4333,15 +4333,13 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr) } if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && coord) { - if (instr->is_array && instr->op != nir_texop_lod) - coords[3] = apply_round_slice(ctx, coords[3]); for (chan = 0; chan < instr->coord_components; chan++) coords[chan] = to_float(ctx, coords[chan]); if (instr->coord_components == 3) coords[3] = LLVMGetUndef(ctx->f32); ac_prepare_cube_coords(&ctx->ac, instr->op == nir_texop_txd, instr->is_array, - coords, derivs); + instr->op == nir_texop_lod, coords, derivs); if (num_deriv_comp) num_deriv_comp--; } diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index f77a5087b94..3adb9daf400 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -4660,6 +4660,7 @@ static void tex_fetch_args( opcode == TGSI_OPCODE_TXD, target == TGSI_TEXTURE_CUBE_ARRAY || target == TGSI_TEXTURE_SHADOWCUBE_ARRAY, + opcode == TGSI_OPCODE_LODQ, coords, derivs); if (opcode == TGSI_OPCODE_TXD)