Mesa (master): radv: Use correct DCC compressed block size for sampling.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 013aa05edb6d6db7f3615c3d2242f80eee7cb742
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=013aa05edb6d6db7f3615c3d2242f80eee7cb742

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Mon Mar 15 22:15:39 2021 +0100

radv: Use correct DCC compressed block size for sampling.

Don't need to change the pre-GFX9 samplers because this option doesn't
vary there.

Fixes: f848f2adfae ("radv: Use ac_surface DCC settings for shareable images.")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4455
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4425
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9611>

---

 src/amd/vulkan/radv_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index affef2e9f50..1b61bd4277a 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -874,7 +874,7 @@ gfx10_make_texture_descriptor(struct radv_device *device,
 
 	if (radv_dcc_enabled(image, first_level)) {
 		state[6] |= S_00A018_MAX_UNCOMPRESSED_BLOCK_SIZE(V_028C78_MAX_BLOCK_SIZE_256B) |
-			    S_00A018_MAX_COMPRESSED_BLOCK_SIZE(V_028C78_MAX_BLOCK_SIZE_128B) |
+			    S_00A018_MAX_COMPRESSED_BLOCK_SIZE(image->planes[0].surface.u.gfx9.dcc.max_compressed_block_size) |
 			    S_00A018_ALPHA_IS_ON_MSB(vi_alpha_is_on_msb(device, vk_format));
 	}