Title: [274663] branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE
- Revision
- 274663
- Author
- [email protected]
- Date
- 2021-03-18 12:09:17 -0700 (Thu, 18 Mar 2021)
Log Message
Cherry-pick r274654. rdar://problem/75583447
'MTLLanguageVersion1_0' is unavailable on Catalyst
https://bugs.webkit.org/show_bug.cgi?id=223392
Patch by Kyle Piddington <[email protected]> on 2021-03-18
Reviewed by Jon Lee.
Disable switch case in catalyst builds
* src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
(GetOperatorString):
* src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
* src/libANGLE/renderer/metal/FrameBufferMtl.mm:
(rx::FramebufferMtl::readPixels):
* src/libANGLE/renderer/metal/mtl_utils.mm:
(rx::mtl::GetUserSetOrHighestMSLVersion):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/ChangeLog (274662 => 274663)
--- branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-03-18 19:09:02 UTC (rev 274662)
+++ branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-03-18 19:09:17 UTC (rev 274663)
@@ -1,3 +1,42 @@
+2021-03-18 Alan Coon <[email protected]>
+
+ Cherry-pick r274654. rdar://problem/75583447
+
+ 'MTLLanguageVersion1_0' is unavailable on Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=223392
+
+ Patch by Kyle Piddington <[email protected]> on 2021-03-18
+ Reviewed by Jon Lee.
+
+ Disable switch case in catalyst builds
+
+ * src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
+ (GetOperatorString):
+ * src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
+ * src/libANGLE/renderer/metal/FrameBufferMtl.mm:
+ (rx::FramebufferMtl::readPixels):
+ * src/libANGLE/renderer/metal/mtl_utils.mm:
+ (rx::mtl::GetUserSetOrHighestMSLVersion):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-18 Kyle Piddington <[email protected]>
+
+ 'MTLLanguageVersion1_0' is unavailable on Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=223392
+
+ Reviewed by Jon Lee.
+
+ Disable switch case in catalyst builds
+
+ * src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
+ (GetOperatorString):
+ * src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
+ * src/libANGLE/renderer/metal/FrameBufferMtl.mm:
+ (rx::FramebufferMtl::readPixels):
+ * src/libANGLE/renderer/metal/mtl_utils.mm:
+ (rx::mtl::GetUserSetOrHighestMSLVersion):
+
2021-03-17 Kyle Piddington <[email protected]>
ANGLE Metal fixups for program generation, readPixels
Modified: branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_utils.mm (274662 => 274663)
--- branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_utils.mm 2021-03-18 19:09:02 UTC (rev 274662)
+++ branches/safari-612.1.7-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_utils.mm 2021-03-18 19:09:17 UTC (rev 274663)
@@ -492,7 +492,8 @@
case 1:
switch (minor)
{
-#if (defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0)
+#if (defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0) &&\
+ (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
case 0: return MTLLanguageVersion1_0;
#endif
#if (defined(__MAC_10_11) && __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_11) ||\
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
