From 15a9d5f82c4bf9c9cdd71295aed2a83014ce42f1 Mon Sep 17 00:00:00 2001 From: Oliver Bestmann Date: Sun, 8 Feb 2026 12:53:06 +0100 Subject: [PATCH] hk: add support for interchange_compressed --- src/asahi/vulkan/hk_format.c | 1 + src/asahi/vulkan/hk_image.c | 3 +++ src/asahi/vulkan/hk_image_view.c | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/src/asahi/vulkan/hk_format.c b/src/asahi/vulkan/hk_format.c index 006e3cd05a4..007f4ef891c 100644 --- a/src/asahi/vulkan/hk_format.c +++ b/src/asahi/vulkan/hk_format.c @@ -19,6 +19,7 @@ #include "vk_format.h" uint64_t agx_best_modifiers[] = { + DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED, DRM_FORMAT_MOD_APPLE_GPU_TILED_COMPRESSED, DRM_FORMAT_MOD_APPLE_GPU_TILED, DRM_FORMAT_MOD_LINEAR, diff --git a/src/asahi/vulkan/hk_image.c b/src/asahi/vulkan/hk_image.c index 313655723df..d6912808307 100644 --- a/src/asahi/vulkan/hk_image.c +++ b/src/asahi/vulkan/hk_image.c @@ -748,6 +748,9 @@ static uint32_t modifier_get_score(uint64_t mod) { switch (mod) { + case DRM_FORMAT_MOD_APPLE_INTERCHANGE_COMPRESSED: + return 15; + case DRM_FORMAT_MOD_APPLE_GPU_TILED_COMPRESSED: return 10; diff --git a/src/asahi/vulkan/hk_image_view.c b/src/asahi/vulkan/hk_image_view.c index 27e13e73832..447b4c474c7 100644 --- a/src/asahi/vulkan/hk_image_view.c +++ b/src/asahi/vulkan/hk_image_view.c @@ -343,6 +343,9 @@ pack_texture(struct hk_image_view *view, unsigned view_plane, cfg.depth_linear = layers; cfg.layer_stride_linear = layout->layer_stride_B - 0x80; cfg.extended = true; + } else if (layout->tiling == AIL_TILING_INTERCHANGE) { + assert(layers == 1); + cfg.depth = ALIGN_POT(layout->width_px, 16) / 16; } else { assert((layout->tiling != AIL_TILING_LINEAR) || (layers == 1)); cfg.depth = layers; @@ -463,6 +466,9 @@ pack_pbe(struct hk_device *dev, struct hk_image_view *view, unsigned view_plane, cfg.depth_linear = layers; cfg.layer_stride_linear = (layout->layer_stride_B - 0x80); cfg.extended = true; + } else if (layout->tiling == AIL_TILING_INTERCHANGE) { + assert(layers == 1); + cfg.layers = ALIGN_POT(layout->width_px, 16) / 16; } else { assert((layout->tiling != AIL_TILING_LINEAR) || (layers == 1)); cfg.layers = layers; -- 2.52.0