Spaces:
Running
Running
Eve commited on
make portability_enumeration_ext apple only (llama/5757)
Browse files- ggml-vulkan.cpp +6 -0
ggml-vulkan.cpp
CHANGED
|
@@ -1106,7 +1106,9 @@ void ggml_vk_instance_init() {
|
|
| 1106 |
|
| 1107 |
const std::vector<vk::ExtensionProperties> instance_extensions = vk::enumerateInstanceExtensionProperties();
|
| 1108 |
const bool validation_ext = ggml_vk_instance_validation_ext_available(instance_extensions);
|
|
|
|
| 1109 |
const bool portability_enumeration_ext = ggml_vk_instance_portability_enumeration_ext_available(instance_extensions);
|
|
|
|
| 1110 |
|
| 1111 |
std::vector<const char*> layers;
|
| 1112 |
|
|
@@ -1117,13 +1119,17 @@ void ggml_vk_instance_init() {
|
|
| 1117 |
if (validation_ext) {
|
| 1118 |
extensions.push_back("VK_EXT_validation_features");
|
| 1119 |
}
|
|
|
|
| 1120 |
if (portability_enumeration_ext) {
|
| 1121 |
extensions.push_back("VK_KHR_portability_enumeration");
|
| 1122 |
}
|
|
|
|
| 1123 |
vk::InstanceCreateInfo instance_create_info(vk::InstanceCreateFlags{}, &app_info, layers, extensions);
|
|
|
|
| 1124 |
if (portability_enumeration_ext) {
|
| 1125 |
instance_create_info.flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
|
| 1126 |
}
|
|
|
|
| 1127 |
|
| 1128 |
std::vector<vk::ValidationFeatureEnableEXT> features_enable;
|
| 1129 |
vk::ValidationFeaturesEXT validation_features;
|
|
|
|
| 1106 |
|
| 1107 |
const std::vector<vk::ExtensionProperties> instance_extensions = vk::enumerateInstanceExtensionProperties();
|
| 1108 |
const bool validation_ext = ggml_vk_instance_validation_ext_available(instance_extensions);
|
| 1109 |
+
#ifdef __APPLE__
|
| 1110 |
const bool portability_enumeration_ext = ggml_vk_instance_portability_enumeration_ext_available(instance_extensions);
|
| 1111 |
+
#endif
|
| 1112 |
|
| 1113 |
std::vector<const char*> layers;
|
| 1114 |
|
|
|
|
| 1119 |
if (validation_ext) {
|
| 1120 |
extensions.push_back("VK_EXT_validation_features");
|
| 1121 |
}
|
| 1122 |
+
#ifdef __APPLE__
|
| 1123 |
if (portability_enumeration_ext) {
|
| 1124 |
extensions.push_back("VK_KHR_portability_enumeration");
|
| 1125 |
}
|
| 1126 |
+
#endif
|
| 1127 |
vk::InstanceCreateInfo instance_create_info(vk::InstanceCreateFlags{}, &app_info, layers, extensions);
|
| 1128 |
+
#ifdef __APPLE__
|
| 1129 |
if (portability_enumeration_ext) {
|
| 1130 |
instance_create_info.flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
|
| 1131 |
}
|
| 1132 |
+
#endif
|
| 1133 |
|
| 1134 |
std::vector<vk::ValidationFeatureEnableEXT> features_enable;
|
| 1135 |
vk::ValidationFeaturesEXT validation_features;
|