Commit d8c04e8d authored by Niklas Hambüchen's avatar Niklas Hambüchen Committed by Commit Bot

gpu: Fix llvmpipe render string regex for llvmpipe >= 0.5

Before 0.5, render strings looked like this:

    Gallium 0.4 on llvmpipe (LLVM 4.0, 256 bits)

now they look like this:

    llvmpipe (LLVM 5.0, 256 bits)

Change the regex accordingly to avoid accidentally not matching
the llvmpipe renderer string.

Bug: 854437
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I14a7a7631880b2dcfcd3af5eeb6c01d5be32edb6
Reviewed-on: https://chromium-review.googlesource.com/1108216
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569747}
parent 1a03deb7
...@@ -611,6 +611,7 @@ Nedeljko Babic <nedeljko.babic@imgtec.com> ...@@ -611,6 +611,7 @@ Nedeljko Babic <nedeljko.babic@imgtec.com>
Nikhil Bansal <n.bansal@samsung.com> Nikhil Bansal <n.bansal@samsung.com>
Nikhil Sahni <nikhil.sahni@samsung.com> Nikhil Sahni <nikhil.sahni@samsung.com>
Nikita Ofitserov <himikof@gmail.com> Nikita Ofitserov <himikof@gmail.com>
Niklas Hambüchen <mail@nh2.me>
Niklas Schulze <me@jns.io> Niklas Schulze <me@jns.io>
Nikola Kovacs <nikola.kovacs@gmail.com> Nikola Kovacs <nikola.kovacs@gmail.com>
Nils Schneider <nils.schneider@gmail.com> Nils Schneider <nils.schneider@gmail.com>
......
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
"op": ">=", "op": ">=",
"value": "10.1.3" "value": "10.1.3"
}, },
"gl_renderer": ".*Gallium.*llvmpipe.*" "gl_renderer": ".*llvmpipe.*"
} }
], ],
"features": [ "features": [
...@@ -969,7 +969,7 @@ ...@@ -969,7 +969,7 @@
}, },
"driver_vendor": "Mesa", "driver_vendor": "Mesa",
"gl_vendor": "VMware.*", "gl_vendor": "VMware.*",
"gl_renderer": ".*Gallium.*llvmpipe.*", "gl_renderer": ".*llvmpipe.*",
"features": [ "features": [
"all", "all",
{"exceptions": [ {"exceptions": [
...@@ -1322,7 +1322,7 @@ ...@@ -1322,7 +1322,7 @@
"gl_renderer": ".*SVGA3D.*" "gl_renderer": ".*SVGA3D.*"
}, },
{ {
"gl_renderer": ".*Gallium.*llvmpipe.*" "gl_renderer": ".*llvmpipe.*"
}, },
{ {
"gl_renderer": "Mesa OffScreen" "gl_renderer": "Mesa OffScreen"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment