From: Jeff Bolz Date: Thu, 11 Jun 2026 18:22:17 +0000 (-0500) Subject: vulkan: ifdef eMesaHoneykrisp (build fix) (llama/24479) X-Git-Tag: upstream/1.9.2~204 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=afd559279c1a6fd484632b86ee6eee5d70ce04a2;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp vulkan: ifdef eMesaHoneykrisp (build fix) (llama/24479) Fixes build/CI after #24306. --- diff --git a/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ggml/src/ggml-vulkan/ggml-vulkan.cpp index 5f372404..1b1150e7 100644 --- a/ggml/src/ggml-vulkan/ggml-vulkan.cpp +++ b/ggml/src/ggml-vulkan/ggml-vulkan.cpp @@ -6202,6 +6202,7 @@ static vk_device ggml_vk_get_device(size_t idx) { break; } +#if VK_HEADER_VERSION >= 287 // Honeykrisp driver for Asahi Linux doesn't report VK_VENDOR_ID_APPLE. // Check for Honeykrisp driver and force same configuration as the VK_VENDOR_ID_APPLE case. if (device->driver_id == vk::DriverId::eMesaHoneykrisp) { @@ -6212,6 +6213,7 @@ static vk_device ggml_vk_get_device(size_t idx) { device->mul_mat_id_m[i] = true; device->mul_mat_id_s[i] = false; } +#endif device->mul_mat_l_int[i] = device->mul_mat_l[i]; device->mul_mat_m_int[i] = device->mul_mat_m[i];