Title: [287178] trunk/Source/ThirdParty/ANGLE
- Revision
- 287178
- Author
- [email protected]
- Date
- 2021-12-17 03:59:19 -0800 (Fri, 17 Dec 2021)
Log Message
REGRESSION (r287068): [macOS arm64] TestWebKitAPI.GraphicsContextGLCocoaTest.UnrecycledDisplayBuffersNoLeaks is failing
https://bugs.webkit.org/show_bug.cgi?id=234356
<rdar://problem/86533892>
Patch by Kimmo Kinnunen <[email protected]> on 2021-12-17
Reviewed by Antti Koivisto.
Avoid leaking MTLTexture instances for render targets. Leak would happen through
temporary render pass descriptor that would ref the render target texture.
The descriptor was created without autoreleasepool in call stack.
Also fixes the error string leaks.
UnrecycledDisplayBuffersNoLeaks would report leaks of iosurface-backed
GraphicsContextGL default framebuffer bound textures if glClear was called.
* src/libANGLE/renderer/metal/ContextMtl.mm:
(rx::ContextMtl::getRenderPassCommandEncoder):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287177 => 287178)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-17 11:58:26 UTC (rev 287177)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-17 11:59:19 UTC (rev 287178)
@@ -1,3 +1,22 @@
+2021-12-17 Kimmo Kinnunen <[email protected]>
+
+ REGRESSION (r287068): [macOS arm64] TestWebKitAPI.GraphicsContextGLCocoaTest.UnrecycledDisplayBuffersNoLeaks is failing
+ https://bugs.webkit.org/show_bug.cgi?id=234356
+ <rdar://problem/86533892>
+
+ Reviewed by Antti Koivisto.
+
+ Avoid leaking MTLTexture instances for render targets. Leak would happen through
+ temporary render pass descriptor that would ref the render target texture.
+ The descriptor was created without autoreleasepool in call stack.
+ Also fixes the error string leaks.
+
+ UnrecycledDisplayBuffersNoLeaks would report leaks of iosurface-backed
+ GraphicsContextGL default framebuffer bound textures if glClear was called.
+
+ * src/libANGLE/renderer/metal/ContextMtl.mm:
+ (rx::ContextMtl::getRenderPassCommandEncoder):
+
2021-12-16 John Cunningham <[email protected]>
Add support to attribute ownership of ANGLE Metal's resources
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ContextMtl.mm (287177 => 287178)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ContextMtl.mm 2021-12-17 11:58:26 UTC (rev 287177)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ContextMtl.mm 2021-12-17 11:59:19 UTC (rev 287178)
@@ -1586,23 +1586,26 @@
const mtl::ContextDevice &metalDevice = getMetalDevice();
if (mtl::DeviceHasMaximumRenderTargetSize(metalDevice))
{
- MTLRenderPassDescriptor *objCDesc = [MTLRenderPassDescriptor renderPassDescriptor];
- desc.convertToMetalDesc(objCDesc);
- NSUInteger maxSize = mtl::GetMaxRenderTargetSizeForDeviceInBytes(metalDevice);
- NSUInteger renderTargetSize =
- ComputeTotalSizeUsedForMTLRenderPassDescriptor(objCDesc, this, metalDevice);
- if (renderTargetSize > maxSize)
+ ANGLE_MTL_OBJC_SCOPE
{
+ MTLRenderPassDescriptor *objCDesc = [MTLRenderPassDescriptor renderPassDescriptor];
+ desc.convertToMetalDesc(objCDesc);
+ NSUInteger maxSize = mtl::GetMaxRenderTargetSizeForDeviceInBytes(metalDevice);
+ NSUInteger renderTargetSize =
+ ComputeTotalSizeUsedForMTLRenderPassDescriptor(objCDesc, this, metalDevice);
+ if (renderTargetSize > maxSize)
+ {
- NSString *errorString =
- [NSString stringWithFormat:@"This set of render targets requires %lu bytes of "
- @"pixel storage. This device supports %lu bytes.",
- (unsigned long)renderTargetSize, (unsigned long)maxSize];
- NSError *err = [NSError errorWithDomain:@"MTLValidationError"
- code:-1
- userInfo:@{NSLocalizedDescriptionKey : errorString}];
- this->handleError(err, __FILE__, ANGLE_FUNCTION, __LINE__);
- return nil;
+ NSString *errorString = [NSString
+ stringWithFormat:@"This set of render targets requires %lu bytes of "
+ @"pixel storage. This device supports %lu bytes.",
+ (unsigned long)renderTargetSize, (unsigned long)maxSize];
+ NSError *err = [NSError errorWithDomain:@"MTLValidationError"
+ code:-1
+ userInfo:@{NSLocalizedDescriptionKey : errorString}];
+ this->handleError(err, __FILE__, ANGLE_FUNCTION, __LINE__);
+ return nil;
+ }
}
}
return &mRenderEncoder.restart(desc);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
