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

Revert of Default SK_ANGLE to true on Windows, run angle whenever possible on bots. (patchset #3 id:40001 of https://codereview.chromium.org/946933006/)

Browse Source 
Reason for revert:
Needs bot upgrades.

Original issue's description:
> Default SK_ANGLE to true on Windows, run angle whenever possible on bots.
>
> nanobench doesn't need an update.  It uses the default for --config,
> which includes angle.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/88ec329b580a081d9d56cbcaad0ee46cb941c849

TBR=bsalomon@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/954243002
This commit is contained in:
mtklein 2015-02-25 08:16:19 -08:00 committed by Commit bot
parent fbe0edfec4
commit ee2a3eaf99
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gyp/common_variables.gypi
View File

@ -83,10 +83,8 @@
}],
[ 'skia_os == "win"', {
'os_posix%': 0,
'skia_angle%': 1,
}, {
'os_posix%': 1,
'skia_angle%': 0,
}],
[ 'skia_os in ["linux"]', {
'skia_poppler_enabled%': 1,
@ -149,6 +147,7 @@
'skia_android_path_rendering%': 0,
'skia_resource_cache_mb_limit%': 0,
'skia_resource_cache_count_limit%': 0,
'skia_angle%': 0,
'skia_gdi%': 0,
'skia_gpu%': 1,
'skia_osx_deployment_target%': '',

23
tools/dm_flags.json
View File

@ -5,7 +5,6 @@
"8888",
"gpu",
"nvprmsaa4",
"angle",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@ -46,7 +45,6 @@
"8888",
"gpu",
"nvprmsaa4",
"angle",
"--blacklist",
"gpu",
"_",
@ -83,7 +81,6 @@
"8888",
"gpu",
"nvprmsaa4",
"angle",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@ -104,7 +101,6 @@
"8888",
"gpu",
"nvprmsaa4",
"angle",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@ -118,5 +114,24 @@
"PANO_20121023_214540.jpg",
"--match",
"~Threaded"
],
"Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
"--config",
"565",
"8888",
"gpu",
"nvprmsaa4",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"angle",
"--blacklist",
"gpu",
"_",
"PANO_20121023_214540.jpg",
"msaa",
"_",
"PANO_20121023_214540.jpg"
]
}

5
tools/dm_flags.py
View File

@ -22,13 +22,15 @@ cov_start = lineno()+1 # We care about coverage starting just past this def.
def get_args(bot):
args = []
configs = ['565', '8888', 'gpu', 'nvprmsaa4', 'angle']
configs = ['565', '8888', 'gpu', 'nvprmsaa4']
# Xoom and NP are running out of RAM when we run all these modes. skia:3255
if ('Xoom' not in bot and
'NexusPlayer' not in bot):
configs.extend(mode + '-8888' for mode in
['serialize', 'tiles_rt', 'pipe'])
configs.append('tiles_rt-gpu')
if 'ANGLE' in bot:
configs.append('angle')
args.append('--config')
args.extend(configs)
@ -86,6 +88,7 @@ def self_test():
'Test-Android-Xoom-Tegra2-Arm7-Release',
'Test-ChromeOS-Alex-GMA3150-x86-Debug',
'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
]
cov = coverage.coverage()