Changeset 288074 in webkit

Timestamp:

Jan 16, 2022, 1:34:17 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r286603): Leak of three NSMutableDictionary objects each time rx::DisplayMtl::getMetalDeviceMatchingAttribute() is called
<​https://webkit.org/b/235278>
<rdar://problem/87653812>

Reviewed by Darin Adler.

• src/libANGLE/renderer/metal/DisplayMtl.mm:

(rx::DisplayMtl::getMetalDeviceMatchingAttribute):

• Make use of mtl::adoptObjCObj<> so these objects are relaseed when the method returns.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/DisplayMtl.mm (modified) (4 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2022-01-16  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r286603): Leak of three NSMutableDictionary objects each time rx::DisplayMtl::getMetalDeviceMatchingAttribute() is called
+        <https://webkit.org/b/235278>
+        <rdar://problem/87653812>
+
+        Reviewed by Darin Adler.
+
+        * src/libANGLE/renderer/metal/DisplayMtl.mm:
+        (rx::DisplayMtl::getMetalDeviceMatchingAttribute):
+        - Make use of mtl::adoptObjCObj<> so these objects are relaseed
+          when the method returns.
+
 2022-01-14  Kyle Piddington  <kpiddington@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm

@@ -239 +239 @@
     auto deviceList = mtl::adoptObjCObj(MTLCopyAllDevices());
 
-    NSMutableArray<id<MTLDevice>> *externalGPUs   = [[NSMutableArray alloc] init];
-    NSMutableArray<id<MTLDevice>> *integratedGPUs = [[NSMutableArray alloc] init];
-    NSMutableArray<id<MTLDevice>> *discreteGPUs   = [[NSMutableArray alloc] init];
+    auto externalGPUs = mtl::adoptObjCObj<NSMutableArray<id<MTLDevice>>>([[NSMutableArray alloc] init]);
+    auto integratedGPUs = mtl::adoptObjCObj<NSMutableArray<id<MTLDevice>>>([[NSMutableArray alloc] init]);
+    auto discreteGPUs = mtl::adoptObjCObj<NSMutableArray<id<MTLDevice>>>([[NSMutableArray alloc] init]);
     for (id<MTLDevice> device in deviceList.get())
     {
         if (device.removable)
         {
-            [externalGPUs addObject:device];
+            [externalGPUs.get() addObject:device];
         }
         else if (device.lowPower)
         {
-            [integratedGPUs addObject:device];
+            [integratedGPUs.get() addObject:device];
         }
         else
         {
-            [discreteGPUs addObject:device];
+            [discreteGPUs.get() addObject:device];
         }
     }
@@ -263 +263 @@
     {
         // Search for a discrete GPU first.
-        for (id<MTLDevice> device in discreteGPUs)
+        for (id<MTLDevice> device in discreteGPUs.get())
         {
             if (![device isHeadless])
@@ -272 +272 @@
     {
         // If we've selected a low power device, look through integrated devices.
-        for (id<MTLDevice> device in integratedGPUs)
+        for (id<MTLDevice> device in integratedGPUs.get())
         {
             if (![device isHeadless])
@@ -296 +296 @@
 
     // Default to use a low power device, look through integrated devices.
-    for (id<MTLDevice> device in integratedGPUs)
+    for (id<MTLDevice> device in integratedGPUs.get())
     {
         if (![device isHeadless])