Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/config/software_rendering_list_json.cc

Issue 452293002: Use RE string pattern matching for blacklist strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gpu/config/gpu_control_list_format.txt ('K') | « gpu/config/gpu_driver_bug_list_json.cc ('k') | gpu/gpu.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/software_rendering_list_json.cc
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc
index e0eab81a52cdb788b898439b79daa4d6e90d1c58..384cd0550648ef693d440195c5b93563f5406ab5 100644
--- a/gpu/config/software_rendering_list_json.cc
+++ b/gpu/config/software_rendering_list_json.cc
@@ -18,7 +18,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
{
"name": "software rendering list",
// Please update the version number whenever you change this file.
- "version": "8.10",
+ "version": "9.0",
"entries": [
{
"id": 1,
@@ -42,10 +42,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "gl_renderer": {
- "op": "contains",
- "value": "software"
- },
+ "gl_renderer": ".*software.*",
"features": [
"all"
]
@@ -76,10 +73,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"vendor_id": "0x1002",
"exceptions": [
{
- "driver_vendor": {
- "op": "contains",
- "value": "AMD"
- },
+ "driver_vendor": ".*AMD.*",
"driver_version": {
"op": ">=",
"style": "lexical",
@@ -87,10 +81,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
}
},
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "10.0.4"
@@ -150,10 +141,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
}
},
{
- "driver_vendor": {
- "op": "=",
- "value": "osmesa"
- }
+ "driver_vendor": "osmesa"
},
{
"vendor_id": "0x1414",
@@ -172,10 +160,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"type": "linux"
},
"vendor_id": "0x8086",
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": "<",
"value": "10.1"
@@ -240,20 +225,14 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": "<",
"value": "7.11"
},
"exceptions": [
{
- "driver_vendor": {
- "op": "=",
- "value": "osmesa"
- }
+ "driver_vendor": "osmesa"
}
],
"features": [
@@ -277,16 +256,10 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "gl_vendor": {
- "op": "beginwith",
- "value": "ATI"
- },
+ "gl_vendor": "ATI.*",
"exceptions": [
{
- "driver_vendor": {
- "op": "contains",
- "value": "AMD"
- },
+ "driver_vendor": ".*AMD.*",
"driver_version": {
"op": ">=",
"style": "lexical",
@@ -294,10 +267,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
}
},
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "10.0.4"
@@ -315,20 +285,11 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "gl_vendor": {
- "op": "beginwith",
- "value": "X.Org"
- },
- "gl_renderer": {
- "op": "contains",
- "value": "AMD"
- },
+ "gl_vendor": "X\\.Org.*",
+ "gl_renderer": ".*AMD.*",
"exceptions": [
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "10.0.4"
@@ -346,20 +307,11 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "gl_vendor": {
- "op": "beginwith",
- "value": "X.Org"
- },
- "gl_renderer": {
- "op": "contains",
- "value": "ATI"
- },
+ "gl_vendor": "X\\.Org.*",
+ "gl_renderer": ".*ATI.*",
"exceptions": [
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "10.0.4"
@@ -378,10 +330,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"type": "linux"
},
"vendor_id": "0x10de",
- "gl_vendor": {
- "op": "beginwith",
- "value": "nouveau"
- },
+ "gl_vendor": "nouveau.*",
"features": [
"all"
]
@@ -405,10 +354,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
}
},
{
- "cpu_info": {
- "op": "contains",
- "value": "Atom"
- }
+ "cpu_info": ".*Atom.*"
}
],
"features": [
@@ -449,18 +395,12 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"multi_gpu_style": "optimus",
"exceptions": [
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "10.1"
},
- "gl_vendor": {
- "op": "beginwith",
- "value": "Intel"
- }
+ "gl_vendor": "Intel.*"
}
],
"features": [
@@ -557,10 +497,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"type": "linux"
},
"vendor_id": "0x10de",
- "driver_vendor": {
- "op": "=",
- "value": "NVIDIA"
- },
+ "driver_vendor": "NVIDIA",
"driver_version": {
"op": "<",
"value": "295"
@@ -621,24 +558,15 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "linux"
},
- "gl_vendor": {
- "op": "beginwith",
- "value": "VMware"
- },
+ "gl_vendor": "VMware.*",
"exceptions": [
{
- "driver_vendor": {
- "op": "=",
- "value": "Mesa"
- },
+ "driver_vendor": "Mesa",
"driver_version": {
"op": ">=",
"value": "9.2.1"
},
- "gl_renderer": {
- "op": "contains",
- "value": "SVGA3D"
- }
+ "gl_renderer": ".*SVGA3D.*"
}
],
"features": [
@@ -663,10 +591,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"type": "linux"
},
"vendor_id": "0x10de",
- "driver_vendor": {
- "op": "=",
- "value": "NVIDIA"
- },
+ "driver_vendor": "NVIDIA",
"features": [
"accelerated_video_decode",
"flash_3d",
@@ -716,10 +641,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "android"
},
- "gl_renderer": {
- "op": "contains",
- "value": "Adreno"
- },
+ "gl_renderer": ".*Adreno.*",
"driver_version": {
"op": "<",
"value": "4.1"
@@ -848,10 +770,7 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
"os": {
"type": "win"
},
- "driver_vendor": {
- "op": "=",
- "value": "Microsoft"
- },
+ "driver_vendor": "Microsoft",
"exceptions": [
{
"vendor_id": "0x1414",
@@ -1112,10 +1031,7 @@ LONG_STRING_CONST(
"type": "linux"
},
"vendor_id": "0x1002",
- "driver_vendor": {
- "op": "contains",
- "value": "AMD"
- },
+ "driver_vendor": ".*AMD.*",
"driver_version": {
"op": "=",
"value": "13.101"
« gpu/config/gpu_control_list_format.txt ('K') | « gpu/config/gpu_driver_bug_list_json.cc ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698