AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ask for NVPR only when we expect it to be available.

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1099023003
This commit is contained in:
mtklein 2015-04-21 10:34:47 -07:00 committed by Commit bot
parent 1bdc9351ec
commit fca5c88873
2 changed files with 162 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
tools/dm_flags.json
View File

@ -5,7 +5,6 @@
"8888",
"gpu",
"msaa4",
"nvprmsaa4",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@ -158,7 +157,158 @@
"8888",
"gpu",
"msaa4",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"--blacklist",
"gpu",
"_",
"_",
"PANO_20121023_214540.jpg",
"msaa",
"_",
"_",
"PANO_20121023_214540.jpg",
"_",
"image",
"decode",
"pal8os2v2.bmp",
"_",
"image",
"decode",
"pal8v4.bmp",
"_",
"image",
"decode",
"pal8v5.bmp",
"_",
"image",
"decode",
"rgb16-565.bmp",
"_",
"image",
"decode",
"rgb16-565pal.bmp",
"_",
"image",
"decode",
"rgb32-111110.bmp",
"_",
"image",
"decode",
"rgb32bf.bmp",
"_",
"image",
"decode",
"rgba32.bmp",
"_",
"image",
"decode",
"rgba32abf.bmp",
"_",
"image",
"decode",
"rgb24largepal.bmp",
"_",
"image",
"decode",
"pal8os2v2-16.bmp",
"_",
"image",
"decode",
"pal8oversizepal.bmp",
"_",
"image",
"decode",
"pal4rletrns.bmp",
"_",
"image",
"decode",
"pal8rletrns.bmp",
"_",
"image",
"decode",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"decode",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"decode",
"24bpp-pixeldata-cropped.bmp",
"_",
"image",
"decode",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"subset",
"rgb24largepal.bmp",
"_",
"image",
"subset",
"pal8os2v2-16.bmp",
"_",
"image",
"subset",
"pal8oversizepal.bmp",
"_",
"image",
"subset",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"subset",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"subset",
"24bpp-pixeldata-cropped.bmp",
"_",
"image",
"subset",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"decode",
"Hopstarter-Mac-Folders-Apple.ico",
"gpu",
"skp",
"_",
"_",
"msaa",
"skp",
"_",
"_",
"gpu",
"image",
"decode",
"_",
"msaa",
"image",
"decode",
"_",
"gpu",
"image",
"subset",
"_",
"msaa",
"image",
"subset",
"_",
"--match",
"~tabl_mozilla_0",
"~desk_yahoonews_0"
],
"Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
"--config",
"565",
"8888",
"gpu",
"nvprmsaa4",
"msaa4",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@ -457,7 +607,6 @@
"8888",
"gpu",
"msaa4",
"nvprmsaa4",
"--blacklist",
"gpu",
"_",
@ -606,7 +755,6 @@
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
@ -734,7 +882,6 @@
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
@ -885,8 +1032,8 @@
"565",
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"msaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
@ -1038,7 +1185,6 @@
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",

12
tools/dm_flags.py
View File

@ -30,14 +30,21 @@ def get_args(bot):
args = []
configs = ['565', '8888', 'gpu']
if 'TegraK1' in bot or 'GTX550Ti' in bot or 'GTX660' in bot or 'GT610' in bot:
if 'Android' in bot:
configs.append('nvprmsaa4')
else:
configs.append('nvprmsaa16')
# The S4 crashes and the NP produces a long error stream when we run with
# MSAA.
if ('GalaxyS4' not in bot and
'NexusPlayer' not in bot):
if 'Android' in bot:
configs.extend(['msaa4', 'nvprmsaa4'])
configs.append('msaa4')
else:
configs.extend(['msaa16', 'nvprmsaa16'])
configs.append('msaa16')
# Runs out of memory on Android bots and Daisy. Everyone else seems fine.
if 'Android' not in bot and 'Daisy' not in bot:
configs.append('pdf')
@ -150,6 +157,7 @@ def self_test():
import coverage # This way the bots don't need coverage.py to be installed.
args = {}
cases = [
'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug',
'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',