Revert 233191 "Simplify GPU blacklist for WinAura"

trunk/src/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": "6.14",
+  "version": "6.13",
   "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 108 matching lines @@
           }
         },
         {
           "driver_vendor": {
             "op": "=",
             "value": "osmesa"
           }
         }
       ],
       "features": [
-        "all"
+        "accelerated_2d_canvas",
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 13,
+      "description": "ATI drivers older than 10.6 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x1002",
+      "driver_version": {
+        "op": "<",
+        "value": "8.741"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 14,
+      "description": "NVIDIA drivers older than 257.21 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "<",
+        "value": "6.14.12.5721"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
+      ]
+    },
+    {
+      "id": 15,
+      "description": "Intel drivers older than 14.42.7.5294 on Windows XP are possibly unreliable.",
+      "cr_bugs": [74212],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x8086",
+      "driver_version": {
+        "op": "<",
+        "value": "6.14.10.5294"
+      },
+      "features": [
+        "accelerated_video",
+        "accelerated_video_decode",
+        "3d_css",
+        "multisampling",
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
       ]
     },
     {
       "id": 16,
       "description": "Multisampling is buggy in ATI cards on older MacOSX.",
       "cr_bugs": [67752, 83153],
       "os": {
         "type": "macosx",
         "version": {
           "op": "<",
@@ skipping 282 matching lines @@
           "value": "10.7"
         }
       },
       "vendor_id": "0x10de",
       "device_id": ["0x0863"],
       "features": [
         "accelerated_2d_canvas"
       ]
     },
     {
+      "id": 41,
+      "description": "Disable 3D (but not Stage3D) in Flash on XP",
+      "cr_bugs": [134885],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "features": [
+        "flash_3d"
+      ]
+    },
+    {
       "id": 42,
       "description": "AMD Radeon HD 6490M and 6970M on Snow Leopard are buggy.",
       "cr_bugs": [137307, 285350],
       "os": {
         "type": "macosx",
         "version": {
           "op": "=",
           "value": "10.6"
         }
       },
@@ skipping 141 matching lines @@
       },
       "gl_vendor": {
         "op": "beginwith",
         "value": "VMware"
       },
       "features": [
         "all"
       ]
     },
     {
+      "id": 51,
+      "description": "NVIDIA drivers 6.14.11.9621 is buggy on Windows XP.",
+      "cr_bugs": [152096],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "=",
+        "value": "6.14.11.9621"
+      },
+      "features": [
+        "all"
+      ]
+    },
+    {
+      "id": 52,
+      "description": "NVIDIA drivers 6.14.11.8267 is buggy on Windows XP.",
+      "cr_bugs": [152096],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "driver_version": {
+        "op": "=",
+        "value": "6.14.11.8267"
+      },
+      "features": [
+        "all"
+      ]
+    },
+    {
       "id": 53,
       "description": "The Intel GMA500 is too slow for Stage3D.",
       "cr_bugs": [152096],
       "vendor_id": "0x8086",
       "device_id": ["0x8108", "0x8109"],
       "features": [
         "flash_stage3d"
       ]
     },
     {
@@ skipping 333 matching lines @@
             "op": "=",
             "value": "33362"
           }
         }
       ],
       "features": [
         "webgl"
       ]
     },
     {
+      "id": 77,
+      "description": "Multisampling is reportedly very slow on Quadro NVS 135M/GeForce 8400M GS",
+      "cr_bugs": [279446],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "=",
+          "value": "5"
+        }
+      },
+      "vendor_id": "0x10de",
+      "device_id": ["0x0429", "0x042b"],
+      "features": [
+        "multisampling"
+      ]
+    },
+    {
       "id": 78,
       "description": "Accelerated video decode interferes with GPU blacklist on older Intel drivers",
       "cr_bugs": [180695],
       "os": {
         "type": "win"
       },
       "vendor_id": "0x8086",
       "driver_version": {
         "op": "between",
         "value": "8.15.10.1883",
         "value2": "8.15.10.2702"
       },
       "features": [
         "accelerated_video_decode"
       ]
     },
     {
       "id": 79,
-      "description": "Disable GPU on all Windows versions prior to and including Vista.",
+      "description": "Disable force compositing mode on all Windows versions prior to and including Vista.",
       "cr_bugs": [273920, 170421],
       "os": {
         "type": "win",
         "version": {
           "op": "<=",
           "value": "6.0"
         }
       },
       "features": [
-        "all"
+        "flash_3d",
+        "flash_stage3d",
+        "force_compositing_mode"
       ]
     },
     {
       "id": 80,
       "description": "Texture sharing should be disabled on all Windows machines",
       "cr_bugs": [304369],
       "os": {
         "type": "win"
       },
       "features": [
         "texture_sharing"
       ]
     }
   ]
 }
 
 );  // LONG_STRING_CONST macro
 
 }  // namespace gpu