From f543d87f23555912110e2c0f67a57dcb99d94e08 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Tue, 12 May 2020 11:26:05 -0400 Subject: [PATCH] turnip: update "fetchsize" value to match fdl6_layout changes It seems this is actually a "minimum pitch" value. For example TFETCH6_2_BYTE means a minimum pitch of 128 bytes for mipmap levels. This fixes breakage with compressed formats. For example this test: dEQP-VK.pipeline.sampler.view_type.2d.format.eac_r11_snorm_block.mipmap.linear.lod.equal_min_3_max_3 Fixes: a34b3fa198a4f ("freedreno/fdl: Align after dividing by block size") Signed-off-by: Jonathan Marek Part-of: --- src/freedreno/vulkan/tu_image.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 280263b0f36..45dff2df951 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -151,10 +151,7 @@ tu_image_create(VkDevice _device, enum a6xx_tex_fetchsize tu6_fetchsize(VkFormat format) { - if (vk_format_description(format)->layout == UTIL_FORMAT_LAYOUT_ASTC) - return TFETCH6_16_BYTE; - - switch (vk_format_get_blocksize(format) / vk_format_get_blockwidth(format)) { + switch (vk_format_get_blocksize(format)) { case 1: return TFETCH6_1_BYTE; case 2: return TFETCH6_2_BYTE; case 4: return TFETCH6_4_BYTE; -- 2.30.2