Changeset 291218 in webkit

Timestamp:

Mar 14, 2022 1:42:04 AM (4 months ago)

Author:

commit-queue@webkit.org

Message:

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 <​kkinnunen@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 <Gregg Tavares>
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):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/FrameBufferMtl.mm (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2022-03-14  Kimmo Kinnunen  <kkinnunen@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 <gman@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-12  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -822 +822 @@
     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