| Index: trunk/src/gpu/config/software_rendering_list_json.cc
|
| ===================================================================
|
| --- trunk/src/gpu/config/software_rendering_list_json.cc (revision 289307)
|
| +++ trunk/src/gpu/config/software_rendering_list_json.cc (working copy)
|
| @@ -18,7 +18,7 @@
|
| {
|
| "name": "software rendering list",
|
| // Please update the version number whenever you change this file.
|
| - "version": "8.11",
|
| + "version": "9.0",
|
| "entries": [
|
| {
|
| "id": 1,
|
| @@ -42,10 +42,7 @@
|
| "os": {
|
| "type": "linux"
|
| },
|
| - "gl_renderer": {
|
| - "op": "contains",
|
| - "value": "software"
|
| - },
|
| + "gl_renderer": "(?i).*software.*",
|
| "features": [
|
| "all"
|
| ]
|
| @@ -76,10 +73,7 @@
|
| "vendor_id": "0x1002",
|
| "exceptions": [
|
| {
|
| - "driver_vendor": {
|
| - "op": "contains",
|
| - "value": "AMD"
|
| - },
|
| + "driver_vendor": ".*AMD.*",
|
| "driver_version": {
|
| "op": ">=",
|
| "style": "lexical",
|
| @@ -87,10 +81,7 @@
|
| }
|
| },
|
| {
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "Mesa"
|
| - },
|
| + "driver_vendor": "Mesa",
|
| "driver_version": {
|
| "op": ">=",
|
| "value": "10.0.4"
|
| @@ -150,10 +141,7 @@
|
| }
|
| },
|
| {
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "osmesa"
|
| - }
|
| + "driver_vendor": "osmesa"
|
| },
|
| {
|
| "vendor_id": "0x1414",
|
| @@ -172,10 +160,7 @@
|
| "type": "linux"
|
| },
|
| "vendor_id": "0x8086",
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "Mesa"
|
| - },
|
| + "driver_vendor": "Mesa",
|
| "driver_version": {
|
| "op": "<",
|
| "value": "10.1"
|
| @@ -240,20 +225,14 @@
|
| "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 @@
|
| "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 @@
|
| }
|
| },
|
| {
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "Mesa"
|
| - },
|
| + "driver_vendor": "Mesa",
|
| "driver_version": {
|
| "op": ">=",
|
| "value": "10.0.4"
|
| @@ -315,20 +285,11 @@
|
| "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 @@
|
| "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 @@
|
| "type": "linux"
|
| },
|
| "vendor_id": "0x10de",
|
| - "gl_vendor": {
|
| - "op": "beginwith",
|
| - "value": "nouveau"
|
| - },
|
| + "gl_vendor": "(?i)nouveau.*",
|
| "features": [
|
| "all"
|
| ]
|
| @@ -405,10 +354,7 @@
|
| }
|
| },
|
| {
|
| - "cpu_info": {
|
| - "op": "contains",
|
| - "value": "Atom"
|
| - }
|
| + "cpu_info": "(?i).*Atom.*"
|
| }
|
| ],
|
| "features": [
|
| @@ -449,18 +395,12 @@
|
| "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 @@
|
| "type": "linux"
|
| },
|
| "vendor_id": "0x10de",
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "NVIDIA"
|
| - },
|
| + "driver_vendor": "NVIDIA",
|
| "driver_version": {
|
| "op": "<",
|
| "value": "295"
|
| @@ -621,24 +558,15 @@
|
| "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 @@
|
| "type": "linux"
|
| },
|
| "vendor_id": "0x10de",
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "NVIDIA"
|
| - },
|
| + "driver_vendor": "NVIDIA",
|
| "features": [
|
| "accelerated_video_decode",
|
| "flash_3d",
|
| @@ -716,10 +641,7 @@
|
| "os": {
|
| "type": "android"
|
| },
|
| - "gl_renderer": {
|
| - "op": "contains",
|
| - "value": "Adreno"
|
| - },
|
| + "gl_renderer": ".*Adreno.*",
|
| "driver_version": {
|
| "op": "<",
|
| "value": "4.1"
|
| @@ -848,10 +770,7 @@
|
| "os": {
|
| "type": "win"
|
| },
|
| - "driver_vendor": {
|
| - "op": "=",
|
| - "value": "Microsoft"
|
| - },
|
| + "driver_vendor": "Microsoft",
|
| "exceptions": [
|
| {
|
| "vendor_id": "0x1414",
|
| @@ -1112,10 +1031,7 @@
|
| "type": "linux"
|
| },
|
| "vendor_id": "0x1002",
|
| - "driver_vendor": {
|
| - "op": "contains",
|
| - "value": "AMD"
|
| - },
|
| + "driver_vendor": ".*AMD.*",
|
| "driver_version": {
|
| "op": "=",
|
| "value": "13.101"
|
|
|