From a57308e60b7879ab89bb59abe90b01b5f21e92b5 Mon Sep 17 00:00:00 2001
From: Jiawei Shao <jiawei.shao@intel.com>
Date: Fri, 12 Mar 2021 08:22:47 +0000
Subject: [PATCH] Workaround the compile error when calling std::begin on C
 arrays

This patch adds a workaround for a compile error when calling
std::begin on C-style arrays when rolling Dawn to Skia.

BUG=chromium:1161355

Change-Id: I6b697c383c0f76866e1d35f75bd1f64b96c5d6c5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/44520
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
---
 src/common/GPUInfo.cpp | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/common/GPUInfo.cpp b/src/common/GPUInfo.cpp
index 32d890b6a3..65ef78eec3 100644
--- a/src/common/GPUInfo.cpp
+++ b/src/common/GPUInfo.cpp
@@ -15,6 +15,7 @@
 #include "common/GPUInfo.h"
 
 #include <algorithm>
+#include <array>
 
 namespace gpu_info {
     namespace {
@@ -22,21 +23,21 @@ namespace gpu_info {
         // Referenced from the following Mesa source code:
         // https://github.com/mesa3d/mesa/blob/master/include/pci_ids/i965_pci_ids.h
         // gen9
-        const uint32_t Skylake[] = {0x1902, 0x1906, 0x190A, 0x190B, 0x190E, 0x1912, 0x1913,
-                                    0x1915, 0x1916, 0x1917, 0x191A, 0x191B, 0x191D, 0x191E,
-                                    0x1921, 0x1923, 0x1926, 0x1927, 0x192A, 0x192B, 0x192D,
-                                    0x1932, 0x193A, 0x193B, 0x193D};
+        const std::array<uint32_t, 25> Skylake = {
+            {0x1902, 0x1906, 0x190A, 0x190B, 0x190E, 0x1912, 0x1913, 0x1915, 0x1916,
+             0x1917, 0x191A, 0x191B, 0x191D, 0x191E, 0x1921, 0x1923, 0x1926, 0x1927,
+             0x192A, 0x192B, 0x192D, 0x1932, 0x193A, 0x193B, 0x193D}};
         // gen9p5
-        const uint32_t Kabylake[] = {0x5916, 0x5913, 0x5906, 0x5926, 0x5921, 0x5915, 0x590E,
-                                     0x591E, 0x5912, 0x5917, 0x5902, 0x591B, 0x593B, 0x590B,
-                                     0x591A, 0x590A, 0x591D, 0x5908, 0x5923, 0x5927};
-        const uint32_t Coffeelake[] = {0x87CA, 0x3E90, 0x3E93, 0x3E99, 0x3E9C, 0x3E91,
-                                       0x3E92, 0x3E96, 0x3E98, 0x3E9A, 0x3E9B, 0x3E94,
-                                       0x3EA9, 0x3EA5, 0x3EA6, 0x3EA7, 0x3EA8};
-        const uint32_t WhiskyLake[] = {0x3EA1, 0x3EA4, 0x3EA0, 0x3EA3, 0x3EA2};
-        const uint32_t CometLake[] = {0x9B21, 0x9BA0, 0x9BA2, 0x9BA4, 0x9BA5, 0x9BA8, 0x9BAA,
-                                      0x9BAB, 0x9BAC, 0x9B41, 0x9BC0, 0x9BC2, 0x9BC4, 0x9BC5,
-                                      0x9BC6, 0x9BC8, 0x9BCA, 0x9BCB, 0x9BCC, 0x9BE6, 0x9BF6};
+        const std::array<uint32_t, 20> Kabylake = {
+            {0x5916, 0x5913, 0x5906, 0x5926, 0x5921, 0x5915, 0x590E, 0x591E, 0x5912, 0x5917,
+             0x5902, 0x591B, 0x593B, 0x590B, 0x591A, 0x590A, 0x591D, 0x5908, 0x5923, 0x5927}};
+        const std::array<uint32_t, 17> Coffeelake = {
+            {0x87CA, 0x3E90, 0x3E93, 0x3E99, 0x3E9C, 0x3E91, 0x3E92, 0x3E96, 0x3E98, 0x3E9A, 0x3E9B,
+             0x3E94, 0x3EA9, 0x3EA5, 0x3EA6, 0x3EA7, 0x3EA8}};
+        const std::array<uint32_t, 5> Whiskylake = {{0x3EA1, 0x3EA4, 0x3EA0, 0x3EA3, 0x3EA2}};
+        const std::array<uint32_t, 21> Cometlake = {
+            {0x9B21, 0x9BA0, 0x9BA2, 0x9BA4, 0x9BA5, 0x9BA8, 0x9BAA, 0x9BAB, 0x9BAC, 0x9B41, 0x9BC0,
+             0x9BC2, 0x9BC4, 0x9BC5, 0x9BC6, 0x9BC8, 0x9BCA, 0x9BCB, 0x9BCC, 0x9BE6, 0x9BF6}};
     }  // anonymous namespace
 
     bool IsAMD(PCIVendorID vendorId) {
@@ -66,17 +67,14 @@ namespace gpu_info {
 
     // Intel GPUs
     bool IsSkylake(PCIDeviceID deviceId) {
-        return std::find(std::begin(Skylake), std::end(Skylake), deviceId) != std::end(Skylake);
+        return std::find(Skylake.cbegin(), Skylake.cend(), deviceId) != Skylake.cend();
     }
     bool IsKabylake(PCIDeviceID deviceId) {
-        return std::find(std::begin(Kabylake), std::end(Kabylake), deviceId) != std::end(Kabylake);
+        return std::find(Kabylake.cbegin(), Kabylake.cend(), deviceId) != Kabylake.cend();
     }
     bool IsCoffeelake(PCIDeviceID deviceId) {
-        return (std::find(std::begin(Coffeelake), std::end(Coffeelake), deviceId) !=
-                std::end(Coffeelake)) ||
-               (std::find(std::begin(WhiskyLake), std::end(WhiskyLake), deviceId) !=
-                std::end(WhiskyLake)) ||
-               (std::find(std::begin(CometLake), std::end(CometLake), deviceId) !=
-                std::end(CometLake));
+        return (std::find(Coffeelake.cbegin(), Coffeelake.cend(), deviceId) != Coffeelake.cend()) ||
+               (std::find(Whiskylake.cbegin(), Whiskylake.cend(), deviceId) != Whiskylake.cend()) ||
+               (std::find(Cometlake.cbegin(), Cometlake.cend(), deviceId) != Cometlake.cend());
     }
 }  // namespace gpu_info