commit 6863bb0930cf5e31322585c49460a01e057c16e9
author Jim Van Verth <jvanverth@google.com> Tue Oct 22 12:37:42 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 23 19:32:25 2019 +0000
tree a348fb32b4c2267f4af0121c5123ac688011f03b
parent dd78efd0f5f833787d47b2cc8bed6f6ddeff0191

Set Metal rendertargetproxy via drawableSize

Bug: skia:
Change-Id: Idfe709836a9c0be5ce9b6fd200956ff8e284596d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249981
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/image/SkSurface_GpuMtl.mm

diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm
index a089e17..8739d94 100644
--- a/src/image/SkSurface_GpuMtl.mm
+++ b/src/image/SkSurface_GpuMtl.mm
@@ -48,8 +48,9 @@
     }
 
     GrSurfaceDesc desc;
-    desc.fWidth = metalLayer.drawableSize.width * metalLayer.contentsScale;
-    desc.fHeight = metalLayer.drawableSize.height * metalLayer.contentsScale;
+
+    desc.fWidth = metalLayer.drawableSize.width;
+    desc.fHeight = metalLayer.drawableSize.height;
     desc.fConfig = config;
 
     sk_sp<GrRenderTargetProxy> proxy = proxyProvider->createLazyRenderTargetProxy(
@@ -57,10 +58,9 @@
                 CAMetalLayer* metalLayer = (__bridge CAMetalLayer*)layer;
                 id<CAMetalDrawable> currentDrawable = [metalLayer nextDrawable];
 
-                CGSize size = [metalLayer drawableSize];
                 GrSurfaceDesc desc;
-                desc.fWidth = size.width;
-                desc.fHeight = size.height;
+                desc.fWidth = metalLayer.drawableSize.width;
+                desc.fHeight = metalLayer.drawableSize.height;
                 desc.fConfig = config;
 
                 GrMtlGpu* mtlGpu = (GrMtlGpu*) resourceProvider->priv().gpu();