vcl/quartz/cgutils.mm | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit acb6430800fccd120765110a3822c422fbc9a19d
Author: Patrick Luby <[email protected]>
AuthorDate: Wed Apr 10 08:04:57 2024 -0400
Commit: Adolfo Jayme Barrientos <[email protected]>
CommitDate: Sat Apr 13 21:13:01 2024 +0200
tdf#160590 Disable Metal with Intel HD Graphics 6000
Releasing a Metal buffer resource hangs when fetching pixels from a
Skia surface on this Intel MacBook Air built-in GPU.
Change-Id: Ic3028bf8eb45ebb9f6d71879bf5d96f0401a95c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165927
Tested-by: Jenkins
Reviewed-by: Patrick Luby <[email protected]>
(cherry picked from commit fe3a4bdf48f7b2d4f6da31b4392ac5979653cf9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165945
Reviewed-by: Adolfo Jayme Barrientos <[email protected]>
diff --git a/vcl/quartz/cgutils.mm b/vcl/quartz/cgutils.mm
index 0d611bec11d1..50b7fcd6540c 100644
--- a/vcl/quartz/cgutils.mm
+++ b/vcl/quartz/cgutils.mm
@@ -122,6 +122,16 @@ bool DefaultMTLDeviceIsSupported()
bRet = false;
}
+ if (bRet)
+ {
+ // tdf#160590 Disable Metal with Intel HD Graphics 6000
+ // Releasing a Metal buffer resource hangs when fetching pixels from a
+ // Skia surface on this Intel MacBook Air built-in GPU.
+ static NSString* pIntelHDGraphics6000Prefix = @"Intel(R) Iris(TM)
Graphics 6000";
+ if ([pMetalDevice.name hasPrefix:pIntelHDGraphics6000Prefix])
+ bRet = false;
+ }
+
[pMetalDevice release];
return bRet;
}
