From: Eve Date: Wed, 28 Feb 2024 19:33:37 +0000 (+0000) Subject: make portability_enumeration_ext apple only (llama/5757) X-Git-Tag: upstream/1.7.4~931 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=26dd2f06acbf33edf39dd23249978c9beaf0ba40;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp make portability_enumeration_ext apple only (llama/5757) --- diff --git a/ggml-vulkan.cpp b/ggml-vulkan.cpp index 314e3d7a..896c290b 100644 --- a/ggml-vulkan.cpp +++ b/ggml-vulkan.cpp @@ -1106,7 +1106,9 @@ void ggml_vk_instance_init() { const std::vector instance_extensions = vk::enumerateInstanceExtensionProperties(); const bool validation_ext = ggml_vk_instance_validation_ext_available(instance_extensions); +#ifdef __APPLE__ const bool portability_enumeration_ext = ggml_vk_instance_portability_enumeration_ext_available(instance_extensions); +#endif std::vector layers; @@ -1117,13 +1119,17 @@ void ggml_vk_instance_init() { if (validation_ext) { extensions.push_back("VK_EXT_validation_features"); } +#ifdef __APPLE__ if (portability_enumeration_ext) { extensions.push_back("VK_KHR_portability_enumeration"); } +#endif vk::InstanceCreateInfo instance_create_info(vk::InstanceCreateFlags{}, &app_info, layers, extensions); +#ifdef __APPLE__ if (portability_enumeration_ext) { instance_create_info.flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR; } +#endif std::vector features_enable; vk::ValidationFeaturesEXT validation_features;