Changeset 287044 in webkit

Timestamp:

Dec 14, 2021, 1:16:48 PM (5 years ago)

Author:

Russell Epstein

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

Location:

branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/common/platform.h (modified) (1 diff)
• src/libANGLE/renderer/metal/gen_mtl_format_table.py (modified) (1 diff)
• src/libANGLE/renderer/metal/mtl_format_table_autogen.mm (modified) (1 diff)

branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-12-14  Alan Coon  <alancoon@apple.com>
+
+        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  <kpiddington@apple.com>
+
+            [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  <kpiddington@apple.com>
 

branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/common/platform.h

@@ -133 +133 @@
 #        if TARGET_OS_MACCATALYST
 #            define ANGLE_PLATFORM_MACCATALYST 1
-#            undef TARGET_OS_IOS
 #        endif
 #    endif

branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py

@@ -472 +472 @@
     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,

branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm

@@ -1933 +1933 @@
 
 #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: