diff --git a/.pick_status.json b/.pick_status.json index 4ef665fde51..d3d8f8f9ec4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "radv: disable DCC with signedness reinterpretation on GFX11", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 5251916a488..a1729eba268 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -2096,10 +2096,6 @@ radv_dcc_formats_compatible(enum amd_gfx_level gfx_level, VkFormat format1, VkFo unsigned size1, size2; int i; - /* All formats are compatible on GFX11. */ - if (gfx_level >= GFX11) - return true; - if (format1 == format2) return true; @@ -2122,8 +2118,16 @@ radv_dcc_formats_compatible(enum amd_gfx_level gfx_level, VkFormat format1, VkFo (type1 == dcc_channel_float) != (type2 == dcc_channel_float) || size1 != size2) return false; - if (type1 != type2) + if (type1 != type2) { + /* FIXME: All formats should be compatible on GFX11 but for some reasons DCC with signedness + * reinterpretation doesn't work as expected, like R8_UINT<->R8_SINT. Note that disabling + * fast-clears doesn't help. + */ + if (gfx_level >= GFX11) + return false; + *sign_reinterpret = true; + } return true; }