Generalize GPU rasterization device whitelist.

gpu/config/software_rendering_list_json.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Determines whether certain gpu-related features are blacklisted or not.
 // The format of a valid software_rendering_list.json file is defined in
 // <gpu/config/gpu_control_list_format.txt>.
 // The supported "features" can be found in <gpu/config/gpu_blacklist.cc>.
 
 #include "gpu/config/gpu_control_list_jsons.h"
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
 
 namespace gpu {
 
 const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
 
 {
   "name": "software rendering list",
   // Please update the version number whenever you change this file.
-  "version": "9.13",
+  "version": "9.14",
   "entries": [
     {
       "id": 1,
       "description": "ATI Radeon X1900 is not compatible with WebGL on the Mac",
       "webkit_bugs": [47028],
       "os": {
         "type": "macosx"
       },
       "vendor_id": "0x1002",
       "device_id": ["0x7249"],
@@ skipping 1010 matching lines @@
       "driver_vendor": ".*AMD.*",
       "driver_version": {
         "op": "=",
         "value": "13.101"
       },
       "features": [
         "all"
       ]
     },
     {
       "id": 96,

[vangelis, 2014/12/08 06:12:58]

I would suggest using a different blacklist id for the new entry so that we
don't get it mixed up with the older one when we look at the UMA histograms.

[aelias_OOO_until_Jul13, 2014/12/08 23:13:57]

Done.

[aelias_OOO_until_Jul13, 2014/12/09 00:25:04]

Sorry, I had to revert back to the previous approach.  Ganesh starts enabled
universally and then entries in this file can add to the blacklist.  It's not
possible to have individual entries that remove from the blacklist; the
"whitelist" entries need to be in a single exception block.

-      "description": "GPU rasterization is whitelisted on select devices on Android",
-      "cr_bugs": [362779],
+      "description": "GPU rasterization whitelist",
+      "cr_bugs": [362779,424970],
       "os": {
         "type": "android"
       },
       "exceptions": [
         {
-          "machine_model_name": ["Nexus 4", "Nexus 5", "Nexus 7",
-                                 "XT1049", "XT1050", "XT1052", "XT1053",
-                                 "XT1055", "XT1056", "XT1058", "XT1060",
-                                 "HTC One",
-                                 "C5303", "C6603", "C6903",
-                                 "GT-I9195",
-                                 "GT-I9505",
-                                 "SAMSUNG-SCH-I337", "SCH-I545", "SGH-M919",
-                                 "SM-N900", "SM-N9005", "SPH-L720",
-                                 "XT907", "XT1032", "XT1033", "XT1080"]
+          "os": {
+            "type": "android"
+          },
+          "gl_renderer": "Adreno (TM) 3.*"
         },
         {
           "os": {
+            "type": "android"
+          },
+          "gl_renderer": "NVIDIA.*"

[Zhenyao Mo, 2014/12/06 15:05:28]

should this be gl_vendor instead?

[aelias_OOO_until_Jul13, 2014/12/08 23:13:57]

I tried using gl_vendor in an patch set #1 but I found that rules checking only
gl_vendor match 100% of all devices (of that vendor or not); it looks like
there's a bug with that, maybe you could look into it?

Anyway, for the purposes of this change, all gl_renderer strings I've seen for
NVIDIA start with the company name, so it should be fine.  I also think
gl_renderer-based regexps will be easier to make more specific if we need to
narrow it down in the future.

+        },
+        {
+          "os": {
+            "type": "android"
+          },
+          "gl_renderer": "VideoCore IV.*"
+        },
+        {
+          "os": {
+            "type": "android"
+          },
+          "gl_renderer": "Immersion.*"
+        },
+        {
+          "os": {
             "type": "android",
             "version": {
               "op": ">=",
               "value": "4.4.99"
             }
           }
         },
         {
           "os": {
             "type": "android",
@@ skipping 99 matching lines @@
         "accelerated_2d_canvas",
         "gpu_rasterization"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu