[Bf-blender-cvs] [86abbf71769] blender-v3.3-release: Fix macOS build error after recent changes to enable Intel GPUs
Brecht Van Lommel
noreply at git.blender.org
Mon Nov 28 19:27:06 CET 2022
Commit: 86abbf717691c016077c89692b29349ec22d255b
Author: Brecht Van Lommel
Date: Wed Oct 19 20:31:12 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB86abbf717691c016077c89692b29349ec22d255b
Fix macOS build error after recent changes to enable Intel GPUs
This will only work once we upgrade to the macOS 13 SDK.
Ref D16253
===================================================================
M intern/cycles/device/metal/device_impl.mm
M intern/cycles/device/metal/util.mm
===================================================================
diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm
index f40b056606f..92aa783ed92 100644
--- a/intern/cycles/device/metal/device_impl.mm
+++ b/intern/cycles/device/metal/device_impl.mm
@@ -338,11 +338,13 @@ bool MetalDevice::compile_and_load(MetalPipelineType pso_type)
MTLCompileOptions *options = [[MTLCompileOptions alloc] init];
+#if defined(MAC_OS_VERSION_13_0)
if (@available(macos 13.0, *)) {
if (device_vendor == METAL_GPU_INTEL) {
[options setOptimizationLevel:MTLLibraryOptimizationLevelSize];
}
}
+#endif
options.fastMathEnabled = YES;
if (@available(macOS 12.0, *)) {
diff --git a/intern/cycles/device/metal/util.mm b/intern/cycles/device/metal/util.mm
index eb77aeb6a54..63f84a9df33 100644
--- a/intern/cycles/device/metal/util.mm
+++ b/intern/cycles/device/metal/util.mm
@@ -110,9 +110,11 @@ vector<id<MTLDevice>> const &MetalInfo::get_usable_devices()
usable |= (vendor == METAL_GPU_AMD);
}
+#if defined(MAC_OS_VERSION_13_0)
if (@available(macos 13.0, *)) {
usable |= (vendor == METAL_GPU_INTEL);
}
+#endif
if (usable) {
metal_printf("- %s\n", device_name.c_str());
More information about the Bf-blender-cvs
mailing list