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

aco: implement a workaround for gl_FragCoord.z with VRS on GFX10.3

Browse Source 
Without it, FragCoord.z will have the value of one of the fine pixels
instead of the center of the coarse pixel.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7837>
This commit is contained in:
Samuel Pitoiset
2020-12-10 21:47:23 +01:00
committed by Marge Bot
parent 45524afe95
commit 77343576eb
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -4563,15 +4563,41 @@ void emit_interp_instr(isel_context *ctx, unsigned idx, unsigned component, Temp
void emit_load_frag_coord(isel_context *ctx, Temp dst, unsigned num_components) void emit_load_frag_coord(isel_context *ctx, Temp dst, unsigned num_components)
{ {
Builder bld(ctx->program, ctx->block);
aco_ptr<Pseudo_instruction> vec(create_instruction<Pseudo_instruction>(aco_opcode::p_create_vector, Format::PSEUDO, num_components, 1)); aco_ptr<Pseudo_instruction> vec(create_instruction<Pseudo_instruction>(aco_opcode::p_create_vector, Format::PSEUDO, num_components, 1));
for (unsigned i = 0; i < num_components; i++) for (unsigned i = 0; i < num_components; i++)
vec->operands[i] = Operand(get_arg(ctx, ctx->args->ac.frag_pos[i])); vec->operands[i] = Operand(get_arg(ctx, ctx->args->ac.frag_pos[i]));
if (G_0286CC_POS_W_FLOAT_ENA(ctx->program->config->spi_ps_input_ena)) { if (G_0286CC_POS_W_FLOAT_ENA(ctx->program->config->spi_ps_input_ena)) {
assert(num_components == 4); assert(num_components == 4);
Builder bld(ctx->program, ctx->block);
vec->operands[3] = bld.vop1(aco_opcode::v_rcp_f32, bld.def(v1), get_arg(ctx, ctx->args->ac.frag_pos[3])); vec->operands[3] = bld.vop1(aco_opcode::v_rcp_f32, bld.def(v1), get_arg(ctx, ctx->args->ac.frag_pos[3]));
} }
if (ctx->options->adjust_frag_coord_z &&
G_0286CC_POS_Z_FLOAT_ENA(ctx->program->config->spi_ps_input_ena)) {
/* Adjust gl_FragCoord.z for VRS due to a hw bug on some GFX10.3 chips. */
Operand frag_z = vec->operands[2];
Temp adjusted_frag_z = bld.tmp(v1);
Temp tmp;
/* dFdx fine */
Temp tl = bld.vop1_dpp(aco_opcode::v_mov_b32, bld.def(v1), frag_z, dpp_quad_perm(0, 0, 2, 2));
tmp = bld.vop2_dpp(aco_opcode::v_sub_f32, bld.def(v1), frag_z, tl, dpp_quad_perm(1, 1, 3, 3));
emit_wqm(ctx, tmp, adjusted_frag_z, true);
/* adjusted_frag_z * 0.0625 + frag_z */
adjusted_frag_z = bld.vop3(aco_opcode::v_fma_f32, bld.def(v1), adjusted_frag_z,
Operand(0x3d800000u /* 0.0625 */), frag_z);
/* VRS Rate X = Ancillary[2:3] */
Temp x_rate = bld.vop3(aco_opcode::v_bfe_u32, bld.def(v1),
get_arg(ctx, ctx->args->ac.ancillary), Operand(2u), Operand(2u));
/* xRate = xRate == 0x1 ? adjusted_frag_z : frag_z. */
Temp cond = bld.vopc(aco_opcode::v_cmp_eq_i32, bld.def(bld.lm), Operand(1u), Operand(x_rate));
vec->operands[2] = bld.vop2(aco_opcode::v_cndmask_b32, bld.def(v1), frag_z, adjusted_frag_z, cond);
}
for (Operand& op : vec->operands) for (Operand& op : vec->operands)
op = op.isUndefined() ? Operand(0u) : op; op = op.isUndefined() ? Operand(0u) : op;

9
src/amd/compiler/aco_instruction_selection_setup.cpp
View File

@@ -909,6 +909,15 @@ void init_context(isel_context *ctx, nir_shader *shader)
spi_ps_inputs |= S_0286CC_POS_X_FLOAT_ENA(1) << i; spi_ps_inputs |= S_0286CC_POS_X_FLOAT_ENA(1) << i;
} }
if (ctx->options->adjust_frag_coord_z &&
intrinsic->intrinsic == nir_intrinsic_load_frag_coord &&
G_0286CC_POS_Z_FLOAT_ENA(spi_ps_inputs)) {
/* Enable ancillary for adjusting gl_FragCoord.z for
* VRS due to a hw bug on some GFX10.3 chips.
*/
spi_ps_inputs |= S_0286CC_ANCILLARY_ENA(1);
}
break; break;
} }
case nir_intrinsic_load_sample_id: case nir_intrinsic_load_sample_id: