summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Luby <guibmacdev@gmail.com>2024-04-10 08:04:57 -0400
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2024-04-13 21:13:01 +0200
commitacb6430800fccd120765110a3822c422fbc9a19d (patch)
tree9a566a6fda0efdc05922985af77d4b3e8f258d2a
parenttdf#160567 Replace duplicate style A4 with A0 (diff)
downloadcore-acb6430800fccd120765110a3822c422fbc9a19d.tar.gz
core-acb6430800fccd120765110a3822c422fbc9a19d.zip
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 <guibomacdev@gmail.com> (cherry picked from commit fe3a4bdf48f7b2d4f6da31b4392ac5979653cf9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165945 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--vcl/quartz/cgutils.mm10
1 files changed, 10 insertions, 0 deletions
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;
}