commit 99257618838fc7c04f5dd92238dc2ded125ee07b
author Corentin Wallez <cwallez@google.com> Mon Mar 30 16:08:43 2020 +0000
committer Corentin Wallez <cwallez@google.com> Mon Mar 30 16:09:26 2020 +0000
tree c9997565ffdc0bcb4e4283ce37b0867f55b05518
parent 81d8c2ada561340400ccda0c560dc8f61ffb9a30

Revert "MetalSurface: set layer.device to a ref of the system default device."

This reverts commit 81d8c2ada561340400ccda0c560dc8f61ffb9a30.

Reason for revert: Breaks macOS swiftshader build

Change-Id: I1c54aaf772f651d731d90e843c85549a4f7a38b8
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43208
Tested-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>

src/WSI/BUILD.gn

diff --git a/src/WSI/BUILD.gn b/src/WSI/BUILD.gn
index 6a55805..f1feb31 100644
--- a/src/WSI/BUILD.gn
+++ b/src/WSI/BUILD.gn
@@ -14,15 +14,6 @@
 
 import("../swiftshader.gni")
 
-config("WSI_metal_weak_framework") {
-  if (is_mac) {
-    ldflags = [
-      "-weak_framework",
-      "Metal",
-    ]
-  }
-}
-
 swiftshader_source_set("WSI") {
   sources = [
     "VkSurfaceKHR.cpp",
@@ -51,14 +42,13 @@
 
   if (is_mac) {
     sources += [
-      "MetalSurface.h",
       "MetalSurface.mm",
+      "MetalSurface.h",
     ]
     libs = [
       "Cocoa.framework",
       "QuartzCore.framework",
     ]
-    public_configs = [ ":WSI_metal_weak_framework" ]
   }
 
   include_dirs = [
@@ -73,5 +63,5 @@
     "../Vulkan:swiftshader_libvulkan_headers",
   ]
 
-  configs = [ "../Vulkan:swiftshader_libvulkan_private_config" ]
+  configs = [ "../Vulkan:swiftshader_libvulkan_private_config", ]
 }

src/WSI/MetalSurface.mm

diff --git a/src/WSI/MetalSurface.mm b/src/WSI/MetalSurface.mm
index f88689e..c31248a 100644
--- a/src/WSI/MetalSurface.mm
+++ b/src/WSI/MetalSurface.mm
@@ -40,7 +40,6 @@
         {
             layer = (CAMetalLayer*)[obj retain];
             layer.framebufferOnly = false;
-            layer.device = MTLCreateSystemDefaultDevice();
         }
         else
         {
@@ -69,7 +68,6 @@
     {
         if(layer)
         {
-            [layer.device release];
             [layer release];
         }
         if(view)