Commit 99257618 by Corentin Wallez

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

This reverts commit 81d8c2ad. Reason for revert: Breaks macOS swiftshader build Change-Id: I1c54aaf772f651d731d90e843c85549a4f7a38b8 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43208Tested-by: 's avatarCorentin Wallez <cwallez@google.com> Reviewed-by: 's avatarCorentin Wallez <cwallez@google.com>
parent 81d8c2ad
...@@ -14,15 +14,6 @@ ...@@ -14,15 +14,6 @@
import("../swiftshader.gni") import("../swiftshader.gni")
config("WSI_metal_weak_framework") {
if (is_mac) {
ldflags = [
"-weak_framework",
"Metal",
]
}
}
swiftshader_source_set("WSI") { swiftshader_source_set("WSI") {
sources = [ sources = [
"VkSurfaceKHR.cpp", "VkSurfaceKHR.cpp",
...@@ -51,14 +42,13 @@ swiftshader_source_set("WSI") { ...@@ -51,14 +42,13 @@ swiftshader_source_set("WSI") {
if (is_mac) { if (is_mac) {
sources += [ sources += [
"MetalSurface.h",
"MetalSurface.mm", "MetalSurface.mm",
"MetalSurface.h",
] ]
libs = [ libs = [
"Cocoa.framework", "Cocoa.framework",
"QuartzCore.framework", "QuartzCore.framework",
] ]
public_configs = [ ":WSI_metal_weak_framework" ]
} }
include_dirs = [ include_dirs = [
...@@ -73,5 +63,5 @@ swiftshader_source_set("WSI") { ...@@ -73,5 +63,5 @@ swiftshader_source_set("WSI") {
"../Vulkan:swiftshader_libvulkan_headers", "../Vulkan:swiftshader_libvulkan_headers",
] ]
configs = [ "../Vulkan:swiftshader_libvulkan_private_config" ] configs = [ "../Vulkan:swiftshader_libvulkan_private_config", ]
} }
...@@ -40,7 +40,6 @@ public: ...@@ -40,7 +40,6 @@ public:
{ {
layer = (CAMetalLayer*)[obj retain]; layer = (CAMetalLayer*)[obj retain];
layer.framebufferOnly = false; layer.framebufferOnly = false;
layer.device = MTLCreateSystemDefaultDevice();
} }
else else
{ {
...@@ -69,7 +68,6 @@ public: ...@@ -69,7 +68,6 @@ public:
{ {
if(layer) if(layer)
{ {
[layer.device release];
[layer release]; [layer release];
} }
if(view) if(view)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment