summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Luby <guibmacdev@gmail.com>2024-04-10 08:04:57 -0400
committerPatrick Luby <guibomacdev@gmail.com>2024-04-26 14:10:05 +0200
commitf7579474089bfc67f7d83680d562efa17783e4b4 (patch)
tree9888ee08904c1e40a6d4517ce61c058881050e28
parent1e8ac8b7c865d63014c6655e2e7e77979927c4f7 (diff)
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/+/165946 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Patrick Luby <guibomacdev@gmail.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;
}