commit 95fd2821c2cbdc2bd0fef93ee565faa3f0e8d7a6
author Corentin Wallez <cwallez@chromium.org> Mon Jan 07 10:01:11 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Jan 07 10:01:11 2019 +0000
tree 0a3d621c70e57cebc46580692654900cb83e94eb
parent 9506d539385e5204cd4cb8068a734620923744b1

MetalBinding: query the MTLDevice instead of creating it.

With adapters the Metal backend will be in charge of creating the
MTLDevice so we remove this responsibility from the bindings.

BUG=dawn:29

Change-Id: Id7b9e5f6249963e2b87a91242a18119ba8d11c13
Reviewed-on: https://dawn-review.googlesource.com/c/3661
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn_native/metal/DeviceMTL.h

diff --git a/src/dawn_native/metal/DeviceMTL.h b/src/dawn_native/metal/DeviceMTL.h
index fa96d4e..434ffa8 100644
--- a/src/dawn_native/metal/DeviceMTL.h
+++ b/src/dawn_native/metal/DeviceMTL.h
@@ -34,7 +34,7 @@
 
     class Device : public DeviceBase {
       public:
-        Device(id<MTLDevice> mtlDevice);
+        Device();
         ~Device();
 
         CommandBufferBase* CreateCommandBuffer(CommandBufferBuilder* builder) override;

src/dawn_native/metal/DeviceMTL.mm

diff --git a/src/dawn_native/metal/DeviceMTL.mm b/src/dawn_native/metal/DeviceMTL.mm
index 1e54f5f..1c139b1 100644
--- a/src/dawn_native/metal/DeviceMTL.mm
+++ b/src/dawn_native/metal/DeviceMTL.mm
@@ -122,8 +122,13 @@
         }
     }  // anonymous namespace
 
-    dawnDevice CreateDevice(id<MTLDevice> metalDevice) {
-        return reinterpret_cast<dawnDevice>(new Device(metalDevice));
+    dawnDevice CreateDevice() {
+        return reinterpret_cast<dawnDevice>(new Device());
+    }
+
+    id<MTLDevice> GetMetalDevice(dawnDevice cDevice) {
+        Device* device = reinterpret_cast<Device*>(cDevice);
+        return device->GetMTLDevice();
     }
 
     BackendConnection* Connect(InstanceBase* instance) {
@@ -132,8 +137,8 @@
 
     // Device
 
-    Device::Device(id<MTLDevice> mtlDevice)
-        : mMtlDevice(mtlDevice),
+    Device::Device()
+        : mMtlDevice(MTLCreateSystemDefaultDevice()),
           mMapTracker(new MapRequestTracker(this)),
           mResourceUploader(new ResourceUploader(this)) {
         [mMtlDevice retain];

src/include/dawn_native/MetalBackend.h

diff --git a/src/include/dawn_native/MetalBackend.h b/src/include/dawn_native/MetalBackend.h
index 0808957..aad945a 100644
--- a/src/include/dawn_native/MetalBackend.h
+++ b/src/include/dawn_native/MetalBackend.h
@@ -23,7 +23,8 @@
 #import <QuartzCore/CAMetalLayer.h>
 
 namespace dawn_native { namespace metal {
-    DAWN_NATIVE_EXPORT dawnDevice CreateDevice(id<MTLDevice> metalDevice);
+    DAWN_NATIVE_EXPORT dawnDevice CreateDevice();
+    DAWN_NATIVE_EXPORT id<MTLDevice> GetMetalDevice(dawnDevice device);
 }}  // namespace dawn_native::metal
 
 #endif  // DAWNNATIVE_METALBACKEND_H_

src/utils/MetalBinding.mm

diff --git a/src/utils/MetalBinding.mm b/src/utils/MetalBinding.mm
index 0b41c14..55558ed 100644
--- a/src/utils/MetalBinding.mm
+++ b/src/utils/MetalBinding.mm
@@ -111,9 +111,11 @@
         void SetupGLFWWindowHints() override {
             glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
         }
+
         dawnDevice CreateDevice() override {
-            mMetalDevice = MTLCreateSystemDefaultDevice();
-            return dawn_native::metal::CreateDevice(mMetalDevice);
+            dawnDevice device = dawn_native::metal::CreateDevice();
+            mMetalDevice = dawn_native::metal::GetMetalDevice(device);
+            return device;
         }
 
         uint64_t GetSwapChainImplementation() override {