OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amd/common: round cube array slice in ac_prepare_cube_coords

Browse Source 
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 <marek.olsak@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Nicolai Hähnle
2017-09-13 10:47:02 +02:00
parent 6fb0c1013b
commit e0af3bed2c
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/common/ac_llvm_build.c
View File

@@ -484,7 +484,7 @@ static void build_cube_select(LLVMBuilderRef builder,
void void
ac_prepare_cube_coords(struct ac_llvm_context *ctx, 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 *coords_arg,
LLVMValueRef *derivs_arg) LLVMValueRef *derivs_arg)
{ {
@@ -494,6 +494,11 @@ ac_prepare_cube_coords(struct ac_llvm_context *ctx,
LLVMValueRef coords[3]; LLVMValueRef coords[3];
LLVMValueRef invma; 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); build_cube_intrinsic(ctx, coords_arg, &selcoords);
invma = ac_build_intrinsic(ctx, "llvm.fabs.f32", invma = ac_build_intrinsic(ctx, "llvm.fabs.f32",

2
src/amd/common/ac_llvm_build.h
View File

@@ -110,7 +110,7 @@ ac_build_fdiv(struct ac_llvm_context *ctx,
void void
ac_prepare_cube_coords(struct ac_llvm_context *ctx, 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 *coords_arg,
LLVMValueRef *derivs_arg); LLVMValueRef *derivs_arg);

4
src/amd/common/ac_nir_to_llvm.c
View File

@@ -4550,15 +4550,13 @@ static void visit_tex(struct ac_nir_context *ctx, nir_tex_instr *instr)
} }
if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && coord) { if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && coord) {
if (instr->is_array && instr->op != nir_texop_lod)
coords[3] = apply_round_slice(&ctx->ac, coords[3]);
for (chan = 0; chan < instr->coord_components; chan++) for (chan = 0; chan < instr->coord_components; chan++)
coords[chan] = ac_to_float(&ctx->ac, coords[chan]); coords[chan] = ac_to_float(&ctx->ac, coords[chan]);
if (instr->coord_components == 3) if (instr->coord_components == 3)
coords[3] = LLVMGetUndef(ctx->ac.f32); coords[3] = LLVMGetUndef(ctx->ac.f32);
ac_prepare_cube_coords(&ctx->ac, ac_prepare_cube_coords(&ctx->ac,
instr->op == nir_texop_txd, instr->is_array, instr->op == nir_texop_txd, instr->is_array,
coords, derivs); instr->op == nir_texop_lod, coords, derivs);
if (num_deriv_comp) if (num_deriv_comp)
num_deriv_comp--; num_deriv_comp--;
} }

1
src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
View File

@@ -1483,6 +1483,7 @@ static void tex_fetch_args(
opcode == TGSI_OPCODE_TXD, opcode == TGSI_OPCODE_TXD,
target == TGSI_TEXTURE_CUBE_ARRAY || target == TGSI_TEXTURE_CUBE_ARRAY ||
target == TGSI_TEXTURE_SHADOWCUBE_ARRAY, target == TGSI_TEXTURE_SHADOWCUBE_ARRAY,
opcode == TGSI_OPCODE_LODQ,
coords, derivs); coords, derivs);
if (opcode == TGSI_OPCODE_TXD) if (opcode == TGSI_OPCODE_TXD)