commit 5ef8ab947c4f73cab071de04a2b61db529b98eea
author Avi Drissman <avi@chromium.org> Thu May 19 20:13:36 2022
committer Copybara-Service <copybara-worker@google.com> Thu May 19 20:31:38 2022
tree 0b60e13922ab180da7fe8468368ab8f24d3c29cd
parent 0ee2c40730b06dab9988d581942e0e204bd9205c

Remove OS X 10.11 and macOS 10.12 code from gpu/

Bug: 1322548
Change-Id: I4679da846f387d857391de57d6c569d4962caae8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3651370
Commit-Queue: Peng Huang <penghuang@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1005367}
NOKEYCHECK=True
GitOrigin-RevId: c4b89b73d7898311e66bb80eca5c42d125a6b9f5

command_buffer/service/feature_info.cc

diff --git a/command_buffer/service/feature_info.cc b/command_buffer/service/feature_info.cc
index 3341e13..225cd87 100644
--- a/command_buffer/service/feature_info.cc
+++ b/command_buffer/service/feature_info.cc
@@ -1246,8 +1246,9 @@
   }
 
 #if BUILDFLAG(IS_MAC)
-  // Mac can create GLImages out of AR30 IOSurfaces only after High Sierra.
-  feature_flags_.chromium_image_ar30 = base::mac::IsAtLeastOS10_13();
+  // Mac can create GLImages out of AR30 IOSurfaces only after 10.13 which is
+  // required for Chromium.
+  feature_flags_.chromium_image_ar30 = true;
 #elif !BUILDFLAG(IS_WIN)
   // TODO(mcasas): connect in Windows, https://crbug.com/803451
   // XB30 support was introduced in GLES 3.0/ OpenGL 3.3, before that it was

config/gpu_info_collector_mac.mm

diff --git a/config/gpu_info_collector_mac.mm b/config/gpu_info_collector_mac.mm
index 37dada8..19ee925 100644
--- a/config/gpu_info_collector_mac.mm
+++ b/config/gpu_info_collector_mac.mm
@@ -27,15 +27,17 @@
 };
 
 void RecordReadWriteMetalTexturesSupportedHistogram() {
-  // Metal tiers go 0, 1, 2, but we reserve 0 for when macOS is less then 10.13
-  // and we can't query.
+  // Metal tiers are `MTLReadWriteTextureTier[None|1|2]` which correspond to the
+  // integers 0, 1, and 2. The enum `MetalReadWriteTextureSupportTier` was
+  // written to use integers one higher than the macOS API constants so that it
+  // could support the concept of "unknown". Nowadays, `kUnknown` will only be
+  // logged in the case where `MTLCopyAllDevices()` returns an empty array,
+  // perhaps when running in an environment like VMWare?
   NSUInteger best_tier = 0;
 
-  if (@available(macOS 10.13, *)) {
-    base::scoped_nsobject<NSArray<id<MTLDevice>>> devices(MTLCopyAllDevices());
-    for (id<MTLDevice> device in devices.get()) {
-      best_tier = std::max(best_tier, [device readWriteTextureSupport] + 1);
-    }
+  base::scoped_nsobject<NSArray<id<MTLDevice>>> devices(MTLCopyAllDevices());
+  for (id<MTLDevice> device in devices.get()) {
+    best_tier = std::max(best_tier, [device readWriteTextureSupport] + 1);
   }
 
   UMA_HISTOGRAM_ENUMERATION(