diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-06-25 15:45:09 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-05 12:33:58 +0200 |
| commit | e11e0827ea39b6db73420923ce94cf9add4698bc (patch) | |
| tree | 7ecfa626440eae02d70baabe7e7645b97abd2a77 | |
| parent | 031177a3d8878f43558c29e71d12fcc1d3d0ce56 (diff) | |
ac/nir: clamp shadow texture comparison value on VI
Needed for TC-compatible HTILE in radeonsi for test cases like
piglit spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index c5b28d1c14..b1d13d8417 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4457,7 +4457,19 @@ static void visit_tex(struct ac_nir_context *ctx, nir_tex_instr *instr) /* Pack depth comparison value */ if (instr->is_shadow && comparator) { - address[count++] = llvm_extract_elem(&ctx->ac, comparator, 0); + LLVMValueRef z = llvm_extract_elem(&ctx->ac, comparator, 0); + + /* TC-compatible HTILE promotes Z16 and Z24 to Z32_FLOAT, + * so the depth comparison value isn't clamped for Z16 and + * Z24 anymore. Do it manually here. + * + * It's unnecessary if the original texture format was + * Z32_FLOAT, but we don't know that here. + */ + if (ctx->abi->chip_class == VI) + z = ac_build_clamp(&ctx->ac, z); + + address[count++] = z; } /* pack derivatives */ |