diff options
author | Brian Salomon <bsalomon@google.com> | 2017-01-03 11:35:56 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-03 17:07:21 +0000 |
commit | 534cbe5b9614a8fd0d0328a1cd43ed15b9328cdd (patch) | |
tree | 3ac81360ab6cb6e852fafecfe15a04ac66f0e885 /tests | |
parent | 55325b7c59fe5e8fac809adea7bbec4683d26fab (diff) |
Increase "large" image size in DeferredTextureImage.
Reenable test on GTX10700 bot.
BUG=skia:6080
Change-Id: Ieb4292e88fc337c226dad7ac82c6da84879e9522
Reviewed-on: https://skia-review.googlesource.com/6523
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ImageTest.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index c801d67d67..161dff8853 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -98,8 +98,9 @@ static sk_sp<SkImage> create_image_565() { draw_image_test_pattern(surface->getCanvas()); return surface->makeImageSnapshot(); } -static sk_sp<SkImage> create_image_large() { - const SkImageInfo info = SkImageInfo::MakeN32(32000, 32, kOpaque_SkAlphaType); + +static sk_sp<SkImage> create_image_large(int maxTextureSize) { + const SkImageInfo info = SkImageInfo::MakeN32(maxTextureSize + 1, 32, kOpaque_SkAlphaType); auto surface(SkSurface::MakeRaster(info)); surface->getCanvas()->clear(SK_ColorWHITE); SkPaint paint; @@ -835,6 +836,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) { testContext->makeCurrent(); REPORTER_ASSERT(reporter, proxy); + auto createLarge = [context] { + return create_image_large(context->caps()->maxTextureSize()); + }; struct { std::function<sk_sp<SkImage> ()> fImageFactory; std::vector<SkImage::DeferredTextureImageUsageParams> fParams; @@ -862,18 +866,18 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) { }, {{SkMatrix::I(), kNone_SkFilterQuality, 0}}, kNone_SkFilterQuality, 1, false }, // Create an image that is too large to upload. - { create_image_large, {{SkMatrix::I(), kNone_SkFilterQuality, 0}}, + { createLarge, {{SkMatrix::I(), kNone_SkFilterQuality, 0}}, kNone_SkFilterQuality, 1, false }, // Create an image that is too large, but is scaled to an acceptable size. - { create_image_large, {{SkMatrix::I(), kMedium_SkFilterQuality, 4}}, + { createLarge, {{SkMatrix::I(), kMedium_SkFilterQuality, 4}}, kMedium_SkFilterQuality, 16, true}, // Create an image with multiple low filter qualities, make sure we round up. - { create_image_large, {{SkMatrix::I(), kNone_SkFilterQuality, 4}, - {SkMatrix::I(), kMedium_SkFilterQuality, 4}}, + { createLarge, {{SkMatrix::I(), kNone_SkFilterQuality, 4}, + {SkMatrix::I(), kMedium_SkFilterQuality, 4}}, kMedium_SkFilterQuality, 16, true}, // Create an image with multiple prescale levels, make sure we chose the minimum scale. - { create_image_large, {{SkMatrix::I(), kMedium_SkFilterQuality, 5}, - {SkMatrix::I(), kMedium_SkFilterQuality, 4}}, + { createLarge, {{SkMatrix::I(), kMedium_SkFilterQuality, 5}, + {SkMatrix::I(), kMedium_SkFilterQuality, 4}}, kMedium_SkFilterQuality, 16, true}, }; |