Add Apple renderer strings to PowerVR detection

src/gpu/gl/GrGLUtil.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLUtil.h"
 #include "SkMatrix.h"
@@ skipping 243 matching lines @@
         if (0 == strcmp(rendererString, "NVIDIA Tegra 3")) {
             return kTegra3_GrGLRenderer;
         } else if (0 == strcmp(rendererString, "NVIDIA Tegra")) {
             return kTegra2_GrGLRenderer;
         }
         int lastDigit;
         int n = sscanf(rendererString, "PowerVR SGX 54%d", &lastDigit);
         if (1 == n && lastDigit >= 0 && lastDigit <= 9) {
             return kPowerVR54x_GrGLRenderer;
         }
+        // certain iOS devices also use PowerVR54x GPUs
+        static const char kAppleA4Str[] = "Apple A4";

[bsalomon, 2015/12/10 16:45:28]

I think these report PowerVR, but can't hurt

+        static const char kAppleA5Str[] = "Apple A5";
+        static const char kAppleA6Str[] = "Apple A6";
+        if (0 == strncmp(rendererString, kAppleA4Str,
+                         SK_ARRAY_COUNT(kAppleA4Str)-1) ||
+            0 == strncmp(rendererString, kAppleA5Str,
+                         SK_ARRAY_COUNT(kAppleA5Str)-1) ||
+            0 == strncmp(rendererString, kAppleA6Str,
+                         SK_ARRAY_COUNT(kAppleA6Str)-1)) {
+            return kPowerVR54x_GrGLRenderer;
+        }
         static const char kPowerVRRogueStr[] = "PowerVR Rogue";
+        static const char kAppleA7Str[] = "Apple A7";
+        static const char kAppleA8Str[] = "Apple A8";
         if (0 == strncmp(rendererString, kPowerVRRogueStr,
-                         SK_ARRAY_COUNT(kPowerVRRogueStr)-1)) {
+                         SK_ARRAY_COUNT(kPowerVRRogueStr)-1) ||
+            0 == strncmp(rendererString, kAppleA7Str,
+                         SK_ARRAY_COUNT(kAppleA7Str)-1) ||
+            0 == strncmp(rendererString, kAppleA8Str,
+                         SK_ARRAY_COUNT(kAppleA8Str)-1)) {
             return kPowerVRRogue_GrGLRenderer;
         }
         int adrenoNumber;
         n = sscanf(rendererString, "Adreno (TM) %d", &adrenoNumber);
         if (1 == n) {
             if (adrenoNumber >= 300) {
                 if (adrenoNumber < 400) {
                     return kAdreno3xx_GrGLRenderer;
                 }
                 if (adrenoNumber < 500) {
@@ skipping 46 matching lines @@
     GR_STATIC_ASSERT(2 == kGreater_StencilFunc);
     GR_STATIC_ASSERT(3 == kGEqual_StencilFunc);
     GR_STATIC_ASSERT(4 == kLess_StencilFunc);
     GR_STATIC_ASSERT(5 == kLEqual_StencilFunc);
     GR_STATIC_ASSERT(6 == kEqual_StencilFunc);
     GR_STATIC_ASSERT(7 == kNotEqual_StencilFunc);
     SkASSERT((unsigned) basicFunc < kBasicStencilFuncCount);
 
     return gTable[basicFunc];
 }