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>
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug.json
deleted file mode 100644
index 9e1e949..0000000
--- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug.json
+++ /dev/null
@@ -1,585 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
- "/path/to/tmp/"
- ],
- "name": "Get downloaded SKP VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "42",
- "[START_DIR]\\tmp\\SKP_VERSION"
- ],
- "name": "write SKP_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
- "/path/to/tmp/"
- ],
- "name": "Get downloaded skimage VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "42",
- "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
- ],
- "name": "write SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
- "/path/to/tmp/"
- ],
- "name": "Get downloaded SVG VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "42",
- "[START_DIR]\\tmp\\SVG_VERSION"
- ],
- "name": "write SVG_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CUSTOM_[SWARM_OUT_DIR]]\\dm"
- ],
- "env": {
- "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts"
- },
- "name": "rmtree dm",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[CUSTOM_[SWARM_OUT_DIR]]\\dm",
- "511"
- ],
- "name": "makedirs dm",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[START_DIR]\\tmp",
- "511"
- ],
- "name": "makedirs tmp_dir",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
- "[START_DIR]\\tmp\\uninteresting_hashes.txt"
- ],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
- "name": "get uninteresting hashes",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
- "@@@STEP_LOG_LINE@python.inline@import math@@@",
- "@@@STEP_LOG_LINE@python.inline@import socket@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@",
- "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
- "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
- "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
- "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@",
- "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
- "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@",
- "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@",
- "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
- "@@@STEP_LOG_LINE@python.inline@ print e@@@",
- "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise@@@",
- "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\out\\Debug_x64\\dm",
- "--undefok",
- "--resourcePath",
- "[START_DIR]\\skia\\resources",
- "--skps",
- "[START_DIR]\\skp",
- "--images",
- "[START_DIR]\\skimage\\dm",
- "--colorImages",
- "[START_DIR]\\skimage\\colorspace",
- "--nameByHash",
- "--properties",
- "gitHash",
- "abc123",
- "master",
- "client.skia",
- "builder",
- "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
- "build_number",
- "5",
- "--svgs",
- "[START_DIR]\\svg",
- "--key",
- "arch",
- "x86_64",
- "compiler",
- "MSVC",
- "configuration",
- "Debug",
- "cpu_or_gpu",
- "GPU",
- "cpu_or_gpu_value",
- "GTX1070",
- "model",
- "ZBOX",
- "os",
- "Win10",
- "--uninterestingHashesFile",
- "[START_DIR]\\tmp\\uninteresting_hashes.txt",
- "--writePath",
- "[CUSTOM_[SWARM_OUT_DIR]]\\dm",
- "--nocpu",
- "--config",
- "8888",
- "srgb",
- "gpu",
- "gpudft",
- "gpusrgb",
- "pdf",
- "msaa16",
- "serialize-8888",
- "tiles_rt-8888",
- "pic-8888",
- "--src",
- "tests",
- "gm",
- "image",
- "colorImage",
- "svg",
- "--blacklist",
- "gpusrgb",
- "image",
- "_",
- "_",
- "8888",
- "image",
- "_",
- "_",
- "_",
- "image",
- "gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "pal8os2v2.bmp",
- "_",
- "image",
- "gen_platf",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "gen_platf",
- "rgba32abf.bmp",
- "_",
- "image",
- "gen_platf",
- "rgb24prof.bmp",
- "_",
- "image",
- "gen_platf",
- "rgb24lprof.bmp",
- "_",
- "image",
- "gen_platf",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "gen_platf",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "gen_platf",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "gen_platf",
- "24bpp-pixeldata-cropped.bmp",
- "serialize-8888",
- "gm",
- "_",
- "bleed_image",
- "serialize-8888",
- "gm",
- "_",
- "c_gms",
- "serialize-8888",
- "gm",
- "_",
- "colortype",
- "serialize-8888",
- "gm",
- "_",
- "colortype_xfermodes",
- "serialize-8888",
- "gm",
- "_",
- "drawfilter",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_0.75_0",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds_1_-0.25",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_bounds",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_match",
- "serialize-8888",
- "gm",
- "_",
- "fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "imagemasksubset",
- "serialize-8888",
- "gm",
- "_",
- "bitmapfilters",
- "serialize-8888",
- "gm",
- "_",
- "bitmapshaders",
- "serialize-8888",
- "gm",
- "_",
- "bleed",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_bmp",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_bmp_shader",
- "serialize-8888",
- "gm",
- "_",
- "convex_poly_clip",
- "serialize-8888",
- "gm",
- "_",
- "extractalpha",
- "serialize-8888",
- "gm",
- "_",
- "filterbitmap_checkerboard_32_32_g8",
- "serialize-8888",
- "gm",
- "_",
- "filterbitmap_image_mandrill_64",
- "serialize-8888",
- "gm",
- "_",
- "shadows",
- "serialize-8888",
- "gm",
- "_",
- "simpleaaclip_aaclip",
- "serialize-8888",
- "gm",
- "_",
- "composeshader_bitmap",
- "serialize-8888",
- "gm",
- "_",
- "scaled_tilemodes_npot",
- "serialize-8888",
- "gm",
- "_",
- "scaled_tilemodes",
- "serialize-8888",
- "gm",
- "_",
- "typefacerendering_pfaMac",
- "serialize-8888",
- "gm",
- "_",
- "parsedpaths",
- "serialize-8888",
- "gm",
- "_",
- "ImageGeneratorExternal_rect",
- "serialize-8888",
- "gm",
- "_",
- "ImageGeneratorExternal_shader",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
- "pic-8888",
- "gm",
- "_",
- "drawfilter",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
- "pic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "serialize-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
- "pic-8888",
- "gm",
- "_",
- "gamut",
- "serialize-8888",
- "gm",
- "_",
- "gamut",
- "pic-8888",
- "gm",
- "_",
- "complexclip4_bw",
- "serialize-8888",
- "gm",
- "_",
- "complexclip4_bw",
- "pic-8888",
- "gm",
- "_",
- "complexclip4_aa",
- "serialize-8888",
- "gm",
- "_",
- "complexclip4_aa",
- "tiles_rt-8888",
- "gm",
- "_",
- "complexclip4_bw",
- "tiles_rt-8888",
- "gm",
- "_",
- "complexclip4_aa",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
- "_",
- "image",
- "_",
- ".arw",
- "_",
- "image",
- "_",
- ".cr2",
- "_",
- "image",
- "_",
- ".dng",
- "_",
- "image",
- "_",
- ".nef",
- "_",
- "image",
- "_",
- ".nrw",
- "_",
- "image",
- "_",
- ".orf",
- "_",
- "image",
- "_",
- ".raf",
- "_",
- "image",
- "_",
- ".rw2",
- "_",
- "image",
- "_",
- ".pef",
- "_",
- "image",
- "_",
- ".srw",
- "_",
- "image",
- "_",
- ".ARW",
- "_",
- "image",
- "_",
- ".CR2",
- "_",
- "image",
- "_",
- ".DNG",
- "_",
- "image",
- "_",
- ".NEF",
- "_",
- "image",
- "_",
- ".NRW",
- "_",
- "image",
- "_",
- ".ORF",
- "_",
- "image",
- "_",
- ".RAF",
- "_",
- "image",
- "_",
- ".RW2",
- "_",
- "image",
- "_",
- ".PEF",
- "_",
- "image",
- "_",
- ".SRW",
- "--match",
- "~DeferredTextureImage"
- ],
- "cwd": "[START_DIR]\\skia",
- "name": "dm"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py
index 8ca7872..92cac39 100644
--- a/infra/bots/recipes/swarm_test.py
+++ b/infra/bots/recipes/swarm_test.py
@@ -45,7 +45,6 @@
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
- 'Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug',
'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
'Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
@@ -359,9 +358,6 @@
if 'Nexus10' in bot: # skia:5509
match.append('~CopySurface')
- if 'GTX1070' in bot and 'Win' in bot: # skia:6080
- match.append('~DeferredTextureImage')
-
if 'ANGLE' in bot and 'Debug' in bot:
match.append('~GLPrograms') # skia:4717
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index c801d67..161dff8 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -98,8 +98,9 @@
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 @@
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 @@
}, {{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},
};