Title: [291666] branches/safari-613-branch/Source/ThirdParty/ANGLE
- Revision
- 291666
- Author
- alanc...@apple.com
- Date
- 2022-03-22 10:56:43 -0700 (Tue, 22 Mar 2022)
Log Message
Cherry-pick r291218. rdar://problem/89382320
REGRESSION (iOS 15.4 beta) - WebGL yields incorrect results when using preserveDrawingBuffer on iOS 15.4 Beta
https://bugs.webkit.org/show_bug.cgi?id=237113
Patch by Kimmo Kinnunen <kkinnu...@apple.com> on 2022-03-14
Reviewed by Myles C. Maxfield.
Cherry-pick without tests conflicting tests.
Cherry-pick ANGLE commit: 74f3270214394c896154e4bf9338e7d75002de61
From: Gregg Tavares <g...@chromium.org>
Date: Thu, 3 Mar 2022 13:13:34 -0800
Subject: [PATCH] Metal: Fix for mulitsampled buffers losing their contents
Fixes tst included as well as WebGL CTS
https://www.khronos.org/registry/webgl/sdk/tests/conformance2/renderbuffers/multisample-draws-between-blits.html
Both fail on M1 without this fix.
Also fixes WebKit bug https://bugs.webkit.org/show_bug.cgi?id=237113
Bug: angleproject:7073
* src/libANGLE/renderer/metal/FrameBufferMtl.mm:
(rx::FramebufferMtl::setLoadStoreActionOnRenderPassFirstStart):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/ThirdParty/ANGLE/ChangeLog (291665 => 291666)
--- branches/safari-613-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-22 17:56:40 UTC (rev 291665)
+++ branches/safari-613-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-22 17:56:43 UTC (rev 291666)
@@ -1,3 +1,62 @@
+2022-03-21 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r291218. rdar://problem/89382320
+
+ REGRESSION (iOS 15.4 beta) - WebGL yields incorrect results when using preserveDrawingBuffer on iOS 15.4 Beta
+ https://bugs.webkit.org/show_bug.cgi?id=237113
+
+ Patch by Kimmo Kinnunen <kkinnu...@apple.com> on 2022-03-14
+ Reviewed by Myles C. Maxfield.
+
+ Cherry-pick without tests conflicting tests.
+
+ Cherry-pick ANGLE commit: 74f3270214394c896154e4bf9338e7d75002de61
+ From: Gregg Tavares <g...@chromium.org>
+ Date: Thu, 3 Mar 2022 13:13:34 -0800
+ Subject: [PATCH] Metal: Fix for mulitsampled buffers losing their contents
+
+ Fixes tst included as well as WebGL CTS
+
+ https://www.khronos.org/registry/webgl/sdk/tests/conformance2/renderbuffers/multisample-draws-between-blits.html
+
+ Both fail on M1 without this fix.
+
+ Also fixes WebKit bug https://bugs.webkit.org/show_bug.cgi?id=237113
+
+ Bug: angleproject:7073
+
+ * src/libANGLE/renderer/metal/FrameBufferMtl.mm:
+ (rx::FramebufferMtl::setLoadStoreActionOnRenderPassFirstStart):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-14 Kimmo Kinnunen <kkinnu...@apple.com>
+
+ REGRESSION (iOS 15.4 beta) - WebGL yields incorrect results when using preserveDrawingBuffer on iOS 15.4 Beta
+ https://bugs.webkit.org/show_bug.cgi?id=237113
+
+ Reviewed by Myles C. Maxfield.
+
+ Cherry-pick without tests conflicting tests.
+
+ Cherry-pick ANGLE commit: 74f3270214394c896154e4bf9338e7d75002de61
+ From: Gregg Tavares <g...@chromium.org>
+ Date: Thu, 3 Mar 2022 13:13:34 -0800
+ Subject: [PATCH] Metal: Fix for mulitsampled buffers losing their contents
+
+ Fixes tst included as well as WebGL CTS
+
+ https://www.khronos.org/registry/webgl/sdk/tests/conformance2/renderbuffers/multisample-draws-between-blits.html
+
+ Both fail on M1 without this fix.
+
+ Also fixes WebKit bug https://bugs.webkit.org/show_bug.cgi?id=237113
+
+ Bug: angleproject:7073
+
+ * src/libANGLE/renderer/metal/FrameBufferMtl.mm:
+ (rx::FramebufferMtl::setLoadStoreActionOnRenderPassFirstStart):
+
2022-03-01 Russell Epstein <repst...@apple.com>
Cherry-pick r290087. rdar://problem/88713302
Modified: branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/FrameBufferMtl.mm (291665 => 291666)
--- branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/FrameBufferMtl.mm 2022-03-22 17:56:40 UTC (rev 291665)
+++ branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/FrameBufferMtl.mm 2022-03-22 17:56:43 UTC (rev 291666)
@@ -821,17 +821,7 @@
if (attachment.hasImplicitMSTexture())
{
- if (mBackbuffer)
- {
- // Default action for default framebuffer is resolve and keep MS texture's content.
- // We only discard MS texture's content at the end of the frame. See onFrameEnd().
- attachment.storeAction = MTLStoreActionStoreAndMultisampleResolve;
- }
- else
- {
- // Default action is resolve but don't keep MS texture's content.
- attachment.storeAction = MTLStoreActionMultisampleResolve;
- }
+ attachment.storeAction = MTLStoreActionStoreAndMultisampleResolve;
}
else
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
