Title: [288150] branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE
Revision
288150
Author
repst...@apple.com
Date
2022-01-18 14:38:44 -0800 (Tue, 18 Jan 2022)

Log Message

Revert "Cherry-pick r288041. rdar://problem/86457081"

This reverts commit r288044.

Modified Paths

Diff

Modified: branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/ChangeLog (288149 => 288150)


--- branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/ChangeLog	2022-01-18 22:18:06 UTC (rev 288149)
+++ branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/ChangeLog	2022-01-18 22:38:44 UTC (rev 288150)
@@ -1,33 +1,3 @@
-2022-01-14  Russell Epstein  <repst...@apple.com>
-
-        Cherry-pick r288041. rdar://problem/86457081
-
-    ANGLE: Supports32BitFloatFiltering is not supported on TVOS
-    https://bugs.webkit.org/show_bug.cgi?id=235239
-    
-    Reviewed by Darin Adler.
-    
-    <rdar://86457081>
-    Broke an internal build. Caused by https://trac.webkit.org/changeset/286323/webkit
-    
-    * src/libANGLE/renderer/metal/DisplayMtl.mm:
-    (rx::DisplayMtl::supports32BitFloatFiltering const):
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2022-01-14  Kyle Piddington  <kpidding...@apple.com>
-
-            ANGLE: Supports32BitFloatFiltering is not supported on TVOS
-            https://bugs.webkit.org/show_bug.cgi?id=235239
-
-            Reviewed by Darin Adler.
-
-            <rdar://86457081>
-            Broke an internal build. Caused by https://trac.webkit.org/changeset/286323/webkit
-
-            * src/libANGLE/renderer/metal/DisplayMtl.mm:
-            (rx::DisplayMtl::supports32BitFloatFiltering const):
-
 2022-01-11  Russell Epstein  <repst...@apple.com>
 
         Cherry-pick r287894. rdar://problem/87417913

Modified: branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm (288149 => 288150)


--- branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm	2022-01-18 22:18:06 UTC (rev 288149)
+++ branches/safari-613.1.12.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm	2022-01-18 22:38:44 UTC (rev 288150)
@@ -1191,9 +1191,10 @@
 
 bool DisplayMtl::supports32BitFloatFiltering() const
 {
-#if (defined(__MAC_11_0) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_11_0) ||        \
-    (defined(__IPHONE_14_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_14_0)
-    if (@available(ios 14.0, macOS 11.0, *))
+#if (defined(__MAC_11_0) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_11_0) ||\
+    (defined(__IPHONE_14_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_14_0) ||\
+    (defined(__TVOS_14_0) && __TV_OS_VERSION_MIN_REQUIRED >= __TVOS_14_0)
+    if(@available(ios 14.0, macOS 11.0,*))
     {
         return [mMetalDevice supports32BitFloatFiltering];
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to