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

aco: convert 16-bit values before exporting MRTs

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4966>
This commit is contained in:
Samuel Pitoiset 2020-05-08 09:31:03 +02:00 • committed by Marge Bot
parent 462a5fe6f4
commit 9bd3b67163
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -9847,6 +9847,7 @@ static bool export_fs_mrt_color(isel_context *ctx, int slot)
bool is_int8 = (ctx->options->key.fs.is_int8 >> slot) & 1;
bool is_int10 = (ctx->options->key.fs.is_int10 >> slot) & 1;
bool is_16bit = values[0].regClass() == v2b;
switch (col_format)
{
@ -9877,16 +9878,38 @@ static bool export_fs_mrt_color(isel_context *ctx, int slot)
case V_028714_SPI_SHADER_FP16_ABGR:
enabled_channels = 0x5;
compr_op = aco_opcode::v_cvt_pkrtz_f16_f32;
if (is_16bit) {
if (ctx->options->chip_class >= GFX9) {
/* Pack the FP16 values together instead of converting them to
* FP32 and back to FP16.
* TODO: use p_create_vector and let the compiler optimizes.
*/
compr_op = aco_opcode::v_pack_b32_f16;
} else {
for (unsigned i = 0; i < 4; i++) {
if ((write_mask >> i) & 1)
values[i] = bld.vop1(aco_opcode::v_cvt_f32_f16, bld.def(v1), values[i]);
}
}
}
break;
case V_028714_SPI_SHADER_UNORM16_ABGR:
enabled_channels = 0x5;
compr_op = aco_opcode::v_cvt_pknorm_u16_f32;
if (is_16bit && ctx->options->chip_class >= GFX9) {
compr_op = aco_opcode::v_cvt_pknorm_u16_f16;
} else {
compr_op = aco_opcode::v_cvt_pknorm_u16_f32;
}
break;
case V_028714_SPI_SHADER_SNORM16_ABGR:
enabled_channels = 0x5;
compr_op = aco_opcode::v_cvt_pknorm_i16_f32;
if (is_16bit && ctx->options->chip_class >= GFX9) {
compr_op = aco_opcode::v_cvt_pknorm_i16_f16;
} else {
compr_op = aco_opcode::v_cvt_pknorm_i16_f32;
}
break;
case V_028714_SPI_SHADER_UINT16_ABGR: {
@ -9904,6 +9927,13 @@ static bool export_fs_mrt_color(isel_context *ctx, int slot)
values[i]);
}
}
} else if (is_16bit) {
for (unsigned i = 0; i < 4; i++) {
if ((write_mask >> i) & 1) {
Temp tmp = convert_int(bld, values[i].getTemp(), 16, 32, false);
values[i] = Operand(tmp);
}
}
}
break;
}
@ -9928,6 +9958,13 @@ static bool export_fs_mrt_color(isel_context *ctx, int slot)
values[i]);
}
}
} else if (is_16bit) {
for (unsigned i = 0; i < 4; i++) {
if ((write_mask >> i) & 1) {
Temp tmp = convert_int(bld, values[i].getTemp(), 16, 32, true);
values[i] = Operand(tmp);
}
}
}
break;