[webkit-changes] [287044] branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE

Tue, 14 Dec 2021 13:17:50 -0800

Title: [287044] branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE
Revision
287044
Author
[email protected]
Date
2021-12-14 13:16:48 -0800 (Tue, 14 Dec 2021)

Log Message

Cherry-pick r286964. rdar://problem/86413146

    [MacCatalyst] fix iOSMac after refactor in r286899
    https://bugs.webkit.org/show_bug.cgi?id=234250

    Reviewed by Dean Jackson.

    Also includes a longer term fix for
    https://bugs.webkit.org/show_bug.cgi?id=233977

    Tested builds on mac, iOS, TV SDKs, plus iOSMac

    * src/common/platform.h:
    * src/libANGLE/renderer/metal/gen_mtl_format_table.py:
    (gen_image_map_switch_string):
    * src/libANGLE/renderer/metal/mtl_format_table_autogen.mm:
    (rx::mtl::Format::init):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog (287043 => 287044)


--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog	2021-12-14 20:57:19 UTC (rev 287043)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog	2021-12-14 21:16:48 UTC (rev 287044)
@@ -1,3 +1,44 @@
+2021-12-14  Alan Coon  <[email protected]>
+
+        Cherry-pick r286964. rdar://problem/86413146
+
+    [MacCatalyst] fix iOSMac after refactor in r286899
+    https://bugs.webkit.org/show_bug.cgi?id=234250
+    
+    Reviewed by Dean Jackson.
+    
+    Also includes a longer term fix for
+    https://bugs.webkit.org/show_bug.cgi?id=233977
+    
+    Tested builds on mac, iOS, TV SDKs, plus iOSMac
+    
+    * src/common/platform.h:
+    * src/libANGLE/renderer/metal/gen_mtl_format_table.py:
+    (gen_image_map_switch_string):
+    * src/libANGLE/renderer/metal/mtl_format_table_autogen.mm:
+    (rx::mtl::Format::init):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286964 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-12-13  Kyle Piddington  <[email protected]>
+
+            [MacCatalyst] fix iOSMac after refactor in r286899
+            https://bugs.webkit.org/show_bug.cgi?id=234250
+
+            Reviewed by Dean Jackson.
+
+            Also includes a longer term fix for
+            https://bugs.webkit.org/show_bug.cgi?id=233977
+
+            Tested builds on mac, iOS, TV SDKs, plus iOSMac
+
+            * src/common/platform.h:
+            * src/libANGLE/renderer/metal/gen_mtl_format_table.py:
+            (gen_image_map_switch_string):
+            * src/libANGLE/renderer/metal/mtl_format_table_autogen.mm:
+            (rx::mtl::Format::init):
+
 2021-12-10  Kyle Piddington  <[email protected]>
 
         [ANGLE] ASTC-HDR is unavailable on some platforms

Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/common/platform.h (287043 => 287044)


--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/common/platform.h	2021-12-14 20:57:19 UTC (rev 287043)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/common/platform.h	2021-12-14 21:16:48 UTC (rev 287044)
@@ -132,7 +132,6 @@
 #        endif
 #        if TARGET_OS_MACCATALYST
 #            define ANGLE_PLATFORM_MACCATALYST 1
-#            undef TARGET_OS_IOS
 #        endif
 #    endif
 #    // This might be useful globally. At the moment it is used

Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py (287043 => 287044)


--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py	2021-12-14 20:57:19 UTC (rev 287043)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py	2021-12-14 21:16:48 UTC (rev 287044)
@@ -471,7 +471,7 @@
         switch_data += gen_image_map_switch_astc_case_watchos(angle_format, angle_to_gl, astc_tpl_map)
     switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_TV \n "
     # iOS specific
-    switch_data += "#elif TARGET_OS_IPHONE\n"
+    switch_data += "#elif TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST\n"
     for angle_format in sorted(ios_specific_map.keys()):
         switch_data += gen_image_map_switch_simple_case(angle_format, angle_format, angle_to_gl,
                                                         ios_specific_map)

Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm (287043 => 287044)


--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm	2021-12-14 20:57:19 UTC (rev 287043)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm	2021-12-14 21:16:48 UTC (rev 287044)
@@ -1932,7 +1932,7 @@
             break;
 
 #endif // TARGET_OS_IOS || TARGET_OS_TV 
- #elif TARGET_OS_IPHONE
+ #elif TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST
         case angle::FormatID::ASTC_10x10_SRGB_BLOCK:
             
             this->metalFormat = MTLPixelFormatASTC_10x10_sRGB;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to