aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-04-21 11:25:47 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-21 11:25:47 -0700
commitd557462f1fd274400107dd28ea36900da51e42a6 (patch)
tree08ef8e0fdf0c517ca46d0f167be18d22e60dd77f /tools
parent42a2c1d231781d2fcff4cb4ee7be23ea8191e8da (diff)
Skip msaa4 on Tegra 2 and 3.
This will fix the N7 and Xoom bots. TBR=borenet@google.com BUG=skia: Review URL: https://codereview.chromium.org/1099943002
Diffstat (limited to 'tools')
-rw-r--r--tools/dm_flags.json2
-rwxr-xr-xtools/dm_flags.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index c96eaa4bca..be2bd7e052 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -156,7 +156,6 @@
"565",
"8888",
"gpu",
- "msaa4",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@@ -606,7 +605,6 @@
"565",
"8888",
"gpu",
- "msaa4",
"--blacklist",
"gpu",
"_",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 96cdaafd27..1ae7c80f06 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -38,9 +38,11 @@ def get_args(bot):
configs.append('nvprmsaa16')
# The S4 crashes and the NP produces a long error stream when we run with
- # MSAA.
+ # MSAA. The Tegra2 and Tegra3 just don't support it.
if ('GalaxyS4' not in bot and
- 'NexusPlayer' not in bot):
+ 'NexusPlayer' not in bot and
+ 'Tegra2' not in bot and
+ 'Tegra3' not in bot):
if 'Android' in bot:
configs.append('msaa4')
else: