Title: [286964] trunk/Source/ThirdParty/ANGLE
- Revision
- 286964
- Author
- [email protected]
- Date
- 2021-12-13 11:59:50 -0800 (Mon, 13 Dec 2021)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (286963 => 286964)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-13 19:56:23 UTC (rev 286963)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-13 19:59:50 UTC (rev 286964)
@@ -1,3 +1,21 @@
+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-13 Kimmo Kinnunen <[email protected]>
REGRESSION(Safari 15, BigSur): Poor video texture upload performance with MacBook M1, ANGLE OpenGL backend
Modified: trunk/Source/ThirdParty/ANGLE/src/common/platform.h (286963 => 286964)
--- trunk/Source/ThirdParty/ANGLE/src/common/platform.h 2021-12-13 19:56:23 UTC (rev 286963)
+++ trunk/Source/ThirdParty/ANGLE/src/common/platform.h 2021-12-13 19:59:50 UTC (rev 286964)
@@ -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: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py (286963 => 286964)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py 2021-12-13 19:56:23 UTC (rev 286963)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py 2021-12-13 19:59:50 UTC (rev 286964)
@@ -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: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm (286963 => 286964)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm 2021-12-13 19:56:23 UTC (rev 286963)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm 2021-12-13 19:59:50 UTC (rev 286964)
@@ -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
