Cycles: Fix OS version warnings

This patch suppresses OS version warnings and hides currently unsupported Metal GPUs when enumerating devices.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D13506

1 files changed, 11 insertions, 11 deletions

diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm
index fd249204646..4ad5a3caebc 100644
--- a/intern/cycles/device/metal/device_impl.mm
+++ b/intern/cycles/device/metal/device_impl.mm
@@ -308,14 +308,12 @@ bool MetalDevice::load_kernels(const uint _kernel_features)
   MTLCompileOptions *options = [[MTLCompileOptions alloc] init];
 
   options.fastMathEnabled = YES;
-  options.languageVersion = MTLLanguageVersion2_1;
-
-  if (@available(macOS 11.0, *)) {
-    options.languageVersion = MTLLanguageVersion2_3;
-  }
   if (@available(macOS 12.0, *)) {
     options.languageVersion = MTLLanguageVersion2_4;
   }
+  else {
+    return false;
+  }
 
   string metalsrc;
 
@@ -925,12 +923,14 @@ void MetalDevice::tex_alloc(device_texture &mem)
     }
   }
 
-  /* Optimize the texture for GPU access. */
-  id<MTLCommandBuffer> commandBuffer = [mtlGeneralCommandQueue commandBuffer];
-  id<MTLBlitCommandEncoder> blitCommandEncoder = [commandBuffer blitCommandEncoder];
-  [blitCommandEncoder optimizeContentsForGPUAccess:mtlTexture];
-  [blitCommandEncoder endEncoding];
-  [commandBuffer commit];
+  if (@available(macos 10.14, *)) {
+    /* Optimize the texture for GPU access. */
+    id<MTLCommandBuffer> commandBuffer = [mtlGeneralCommandQueue commandBuffer];
+    id<MTLBlitCommandEncoder> blitCommandEncoder = [commandBuffer blitCommandEncoder];
+    [blitCommandEncoder optimizeContentsForGPUAccess:mtlTexture];
+    [blitCommandEncoder endEncoding];
+    [commandBuffer commit];
+  }
 
   /* Set Mapping and tag that we need to (re-)upload to device */
   texture_slot_map[slot] = mtlTexture;