fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

radeonsi: Add nir_lower_poly_line_smooth pass for polygon and line smoothing

Browse source 
Added a new NIR pass for handling polygon and line smoothing and
Removed previous smoothing changes.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16245>
This commit is contained in:
Arvind Yadav 2022-04-29 18:00:36 +05:30 • committed by Marge Bot
parent 2709786bde
commit 25204d89a6
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -1647,6 +1647,9 @@ struct nir_shader *si_get_nir_shader(struct si_shader *shader, bool *free_nir,
progress = true;
}
if (sel->stage == MESA_SHADER_FRAGMENT && key->ps.mono.poly_line_smoothing)
NIR_PASS(progress, nir, nir_lower_poly_line_smooth, SI_NUM_SMOOTH_AA_SAMPLES);
if (progress)
si_nir_opts(sel->screen, nir, true);

25
src/gallium/drivers/radeonsi/si_shader_llvm_ps.c
View file

@ -217,19 +217,6 @@ static void si_alpha_test(struct si_shader_context *ctx, LLVMValueRef alpha)
}
}
static LLVMValueRef si_get_coverage_from_sample_mask(struct si_shader_context *ctx)
{
LLVMValueRef coverage;
/* alpha = alpha * popcount(coverage) / SI_NUM_SMOOTH_AA_SAMPLES */
coverage = LLVMGetParam(ctx->main_fn, SI_PARAM_SAMPLE_COVERAGE);
coverage = ac_build_bit_count(&ctx->ac, ac_to_integer(&ctx->ac, coverage));
coverage = LLVMBuildUIToFP(ctx->ac.builder, coverage, ctx->ac.f32, "");
return LLVMBuildFMul(ctx->ac.builder, coverage,
LLVMConstReal(ctx->ac.f32, 1.0 / SI_NUM_SMOOTH_AA_SAMPLES), "");
}
struct si_ps_exports {
unsigned num;
struct ac_export_args args[10];
@ -508,10 +495,6 @@ void si_llvm_ps_build_end(struct si_shader_context *ctx)
}
}
LLVMValueRef smoothing_coverage = NULL;
if (ctx->shader->key.ps.mono.poly_line_smoothing)
smoothing_coverage = si_get_coverage_from_sample_mask(ctx);
/* Fill the return structure. */
ret = ctx->return_value;
@ -527,11 +510,6 @@ void si_llvm_ps_build_end(struct si_shader_context *ctx)
continue;
if (LLVMTypeOf(color[i][0]) == ctx->ac.f16) {
if (smoothing_coverage) {
color[i][3] = LLVMBuildFMul(builder, color[i][3],
LLVMBuildFPTrunc(builder, smoothing_coverage, ctx->ac.f16, ""), "");
}
for (j = 0; j < 2; j++) {
LLVMValueRef tmp = ac_build_gather_values(&ctx->ac, &color[i][j * 2], 2);
tmp = LLVMBuildBitCast(builder, tmp, ctx->ac.f32, "");
@ -539,9 +517,6 @@ void si_llvm_ps_build_end(struct si_shader_context *ctx)
}
vgpr += 2;
} else {
if (smoothing_coverage)
color[i][3] = LLVMBuildFMul(builder, color[i][3], smoothing_coverage, "");
for (j = 0; j < 4; j++)
ret = LLVMBuildInsertValue(builder, ret, color[i][j], vgpr++, "");
}