chromium/src
0
Fork 0
Code Activity

Assume macOS 11+ in /gpu

Browse Source 
Bug: 41491897
Change-Id: If744e1c7b95dea8f55395e5c2b5813f50c303508
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5738893
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1334432}
This commit is contained in:
Avi Drissman
2024-07-29 20:40:13 +00:00
committed by Chromium LUCI CQ
parent 78a398e909
commit 4142f42f60
4 changed files with 8 additions and 28 deletions

5
gpu/command_buffer/service/feature_info.cc

@ -208,10 +208,7 @@ FeatureInfo::FeatureInfo(
feature_flags_.chromium_image_ycbcr_p010 = base::Contains(
gpu_feature_info.supported_buffer_formats_for_allocation_and_texturing,
gfx::BufferFormat::P010);
#elif BUILDFLAG(IS_MAC)
feature_flags_.chromium_image_ycbcr_p010 =
base::mac::MacOSMajorVersion() >= 11;
#elif BUILDFLAG(IS_IOS)
#elif BUILDFLAG(IS_APPLE)
feature_flags_.chromium_image_ycbcr_p010 = true;
#endif
}

5
gpu/command_buffer/service/shared_image/iosurface_image_backing_factory.mm

@ -155,11 +155,6 @@ IOSurfaceImageBackingFactory::IOSurfaceImageBackingFactory(
if (feature_info->feature_flags().chromium_image_ycbcr_p010) {
supported_formats_.insert(viz::MultiPlaneFormat::kP010);
}
#if BUILDFLAG(IS_MAC)
if (base::mac::MacOSMajorVersion() < 11) {
return;
}
#endif // BUILDFLAG(IS_MAC)
supported_formats_.insert(viz::MultiPlaneFormat::kNV12A);
supported_formats_.insert(viz::MultiPlaneFormat::kNV16);
supported_formats_.insert(viz::MultiPlaneFormat::kNV24);

5
gpu/config/gpu_finch_features.cc

@ -603,11 +603,6 @@ bool IsSkiaGraphiteSupportedByDevice(const base::CommandLine* command_line) {
}
#if BUILDFLAG(IS_MAC)
// The following code tries to match angle::IsMetalRendererAvailable().
// ANGLE requires at least macOS 10.13 for Metal 2.0.
const int macos_version = base::mac::MacOSVersion();
if (macos_version < 10'13'00) {
return false;
}
auto model_name_split = base::SysInfo::SplitHardwareModelNameDoNotUse(
base::SysInfo::HardwareModelName());
if (model_name_split.has_value()) {

21
gpu/ipc/service/gpu_watchdog_thread_unittest.cc

@ -122,8 +122,7 @@ void GpuWatchdogTest::SetUp() {
TimeOutType timeout_type = kNormal;
#if BUILDFLAG(IS_MAC)
// Use a slow timeout for Mac versions <= 11.00 and for MacBookPro model <
// MacBookPro14,1.
// Use a slow timeout for for MacBookPro model < MacBookPro14,1.
//
// As per EveryMac, laptops older than MacBookPro14,1 max out at macOS 12
// Monterey. When macOS 13 is the minimum required version for Chromium, this
@ -131,19 +130,13 @@ void GpuWatchdogTest::SetUp() {
//
// Reference:
// https://everymac.com/systems/by_capability/mac-specs-by-machine-model-machine-id.html
if (base::mac::MacOSMajorVersion() <= 11) {
// Check MacOS version.
timeout_type = kSlow;
} else {
// Check Mac machine model version.
std::string model_str = base::SysInfo::HardwareModelName();
std::optional<base::SysInfo::HardwareModelNameSplit> split =
base::SysInfo::SplitHardwareModelNameDoNotUse(model_str);
std::string model_str = base::SysInfo::HardwareModelName();
std::optional<base::SysInfo::HardwareModelNameSplit> split =
base::SysInfo::SplitHardwareModelNameDoNotUse(model_str);
if (split && split.value().category == "MacBookPro" &&
split.value().model < 14) {
timeout_type = kSlow;
}
if (split && split.value().category == "MacBookPro" &&
split.value().model < 14) {
timeout_type = kSlow;
}
#elif BUILDFLAG(IS_ANDROID)