From df6c52ff2ab07ba02a4618d88f286e313f50e2b8 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 30 May 2025 08:37:11 -0400 Subject: [PATCH] hk: enable ETC, ASTC Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/vulkan/hk_image.c | 25 +++++-------------------- src/asahi/vulkan/hk_physical_device.c | 4 ++-- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/asahi/vulkan/hk_image.c b/src/asahi/vulkan/hk_image.c index b0e9479faef..aa1f2b1ca66 100644 --- a/src/asahi/vulkan/hk_image.c +++ b/src/asahi/vulkan/hk_image.c @@ -59,26 +59,11 @@ hk_get_image_plane_format_features(struct hk_physical_device *pdev, if (!util_is_power_of_two_nonzero(util_format_get_blocksize(p_format))) return 0; - if (util_format_is_compressed(p_format)) { - /* Linear block-compressed images are all sorts of problematic, not sure - * if AGX even supports them. Don't try. - */ - if (tiling != VK_IMAGE_TILING_OPTIMAL) - return 0; - - /* XXX: Conformance fails, e.g.: - * dEQP-VK.pipeline.monolithic.sampler.view_type.2d.format.etc2_r8g8b8a1_unorm_block.mipmap.linear.lod.select_bias_3_7 - * - * I suspect ail bug with mipmapping of compressed :-/ - */ - switch (util_format_description(p_format)->layout) { - case UTIL_FORMAT_LAYOUT_ETC: - case UTIL_FORMAT_LAYOUT_ASTC: - return 0; - default: - break; - } - } + /* Linear block-compressed images are all sorts of problematic, not sure + * if AGX even supports them. Don't try. + */ + if (util_format_is_compressed(p_format) && tiling != VK_IMAGE_TILING_OPTIMAL) + return 0; if (ail_pixel_format[p_format].texturable) { features |= VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT; diff --git a/src/asahi/vulkan/hk_physical_device.c b/src/asahi/vulkan/hk_physical_device.c index 0f518d02d9e..fee594f2eed 100644 --- a/src/asahi/vulkan/hk_physical_device.c +++ b/src/asahi/vulkan/hk_physical_device.c @@ -238,9 +238,9 @@ hk_get_device_features( .alphaToOne = true, .multiViewport = true, .samplerAnisotropy = true, - .textureCompressionETC2 = false, + .textureCompressionETC2 = true, .textureCompressionBC = true, - .textureCompressionASTC_LDR = false, + .textureCompressionASTC_LDR = true, .occlusionQueryPrecise = true, .pipelineStatisticsQuery = true, .vertexPipelineStoresAndAtomics = true,