AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: fix 8-bit/10-bit PS exports clamping

Browse Source 
This broke many tests on GFX6 (Pitcairn).

Fixes: c182154456 ("ac/nir: add ac_nir_lower_ps")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22756>
This commit is contained in:
Samuel Pitoiset
2023-04-28 14:49:49 +02:00
committed by Marge Bot
parent 559d3b0f9a
commit faf27fa0a2
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/common/ac_nir_lower_ps.c
+28 -11
View File
@@ -557,7 +557,6 @@ emit_ps_color_export(nir_builder *b, lower_ps_state *s, gl_frag_result slot, uns
default: {
nir_op pack_op = nir_op_pack_32_2x16;
bool need_clamp = false;
switch (spi_shader_col_format) {
case V_028714_SPI_SHADER_FP16_ABGR:
@@ -567,13 +566,39 @@ emit_ps_color_export(nir_builder *b, lower_ps_state *s, gl_frag_result slot, uns
case V_028714_SPI_SHADER_UINT16_ABGR:
if (type_size == 32) {
pack_op = nir_op_pack_uint_2x16;
need_clamp = is_int8 || is_int10;
if (is_int8 || is_int10) {
/* clamp 32bit output for 8/10 bit color component */
uint32_t max_rgb = is_int8 ? 255 : 1023;
for (int i = 0; i < 4; i++) {
if (!data[i])
continue;
uint32_t max_value = i == 3 && is_int10 ? 3 : max_rgb;
data[i] = nir_umin(b, data[i], nir_imm_int(b, max_value));
}
}
}
break;
case V_028714_SPI_SHADER_SINT16_ABGR:
if (type_size == 32) {
pack_op = nir_op_pack_sint_2x16;
need_clamp = is_int8 || is_int10;
if (is_int8 || is_int10) {
/* clamp 32bit output for 8/10 bit color component */
uint32_t max_rgb = is_int8 ? 127 : 511;
uint32_t min_rgb = is_int8 ? -128 : -512;
for (int i = 0; i < 4; i++) {
if (!data[i])
continue;
uint32_t max_value = i == 3 && is_int10 ? 1 : max_rgb;
uint32_t min_value = i == 3 && is_int10 ? -2u : min_rgb;
data[i] = nir_imin(b, data[i], nir_imm_int(b, max_value));
data[i] = nir_imax(b, data[i], nir_imm_int(b, min_value));
}
}
}
break;
case V_028714_SPI_SHADER_UNORM16_ABGR:
@@ -587,14 +612,6 @@ emit_ps_color_export(nir_builder *b, lower_ps_state *s, gl_frag_result slot, uns
break;
}
/* clamp 32bit output for 8/10 bit color component */
for (int i = 0; i < 4; i++) {
if (need_clamp && data[i]) {
int max_value = is_int10 ? (i == 3 ? 3 : 1023) : 255;
data[i] = nir_umin(b, data[i], nir_imm_int(b, max_value));
}
}
for (int i = 0; i < 2; i++) {
nir_ssa_def *lo = data[i * 2];
nir_ssa_def *hi = data[i * 2 + 1];