diff options
| -rw-r--r-- | dm/DMSrcSink.cpp | 8 | ||||
| -rw-r--r-- | tools/dm_flags.json | 7 | ||||
| -rwxr-xr-x | tools/dm_flags.py | 8 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 9576f69d67..a0dcb1cfc5 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -855,6 +855,14 @@ Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString* log) co const SkISize size = src.size(); const SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType); +#if SK_SUPPORT_GPU + const int maxDimension = factory.getContextInfo(fContextType, fContextOptions). + fGrContext->caps()->maxTextureSize(); + if (maxDimension < SkTMax(size.width(), size.height())) { + return Error::Nonfatal("Src too large to create a texture.\n"); + } +#endif + SkAutoTUnref<SkSurface> surface( NewGpuSurface(&factory, fContextType, fContextOptions, info, fSampleCount, fUseDIText)); if (!surface) { diff --git a/tools/dm_flags.json b/tools/dm_flags.json index 251a952c35..fa2acfeafa 100644 --- a/tools/dm_flags.json +++ b/tools/dm_flags.json @@ -232,6 +232,7 @@ "--src", "tests", "gm", + "image", "--blacklist", "serialize-8888", "gm", @@ -434,6 +435,7 @@ "--src", "tests", "gm", + "image", "--threads", "0", "--blacklist", @@ -636,6 +638,7 @@ "--src", "tests", "gm", + "image", "--threads", "0", "--blacklist", @@ -842,6 +845,7 @@ "--src", "tests", "gm", + "image", "--blacklist", "serialize-8888", "gm", @@ -1042,6 +1046,7 @@ "--src", "tests", "gm", + "image", "--blacklist", "serialize-8888", "gm", @@ -2474,6 +2479,7 @@ "--src", "tests", "gm", + "image", "--blacklist", "pdf", "gm", @@ -2717,6 +2723,7 @@ "--src", "tests", "gm", + "image", "--blacklist", "msaa16", "gm", diff --git a/tools/dm_flags.py b/tools/dm_flags.py index 5fd8a2b878..663507ebb9 100755 --- a/tools/dm_flags.py +++ b/tools/dm_flags.py @@ -80,13 +80,9 @@ def get_args(bot): args.append('--config') args.extend(configs) - # Run tests and gms everywhere, - # and image decoding tests everywhere except GPU bots. + # Run tests, gms, and image decoding tests everywhere. # TODO: remove skp from default --src list? - if 'GPU' in bot: - args.extend('--src tests gm'.split(' ')) - else: - args.extend('--src tests gm image'.split(' ')) + args.extend('--src tests gm image'.split(' ')) if 'GalaxyS' in bot: args.extend(('--threads', '0')) |