diff options
12 files changed, 48 insertions, 79 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json index fcba342ac7..20de870389 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json @@ -821,7 +821,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --nocpu --config gles glessrgb glesmsaa4 glesnvpr4 glesnvprdit4 --gpuThreads 0 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android_Skpbench model PixelC os Android; echo $? >/data/local/tmp/rc", + "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --nocpu --config gles glessrgb glesmsaa4 glesnvpr4 --gpuThreads 0 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android_Skpbench model PixelC os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], "env": { diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 60033f1d84..30c9afe1d0 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -140,7 +140,6 @@ "glsrgb", "glmsaa8", "glnvpr8", - "glnvprdit8", "--loops", "1", "--samples", diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index 7a4db1f528..95c0425338 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -140,7 +140,6 @@ "glsrgb", "glmsaa8", "glnvpr8", - "glnvprdit8", "--loops", "1", "--samples", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index d75497d1c4..e78de8f05e 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -81,8 +81,7 @@ def nanobench_flags(api, bot): 'Quadro' in bot or 'GTX' in bot or ('GT610' in bot and 'Ubuntu17' not in bot)): - configs.extend([gl_prefix + 'nvpr' + sample_count, - gl_prefix + 'nvprdit' + sample_count]) + configs.extend([gl_prefix + 'nvpr' + sample_count]) # We want to test both the OpenGL config and the GLES config on Linux Intel: # GL is used by Chrome, GLES is used by ChromeOS. diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json index 09ef5d85a2..39b99a0a81 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json @@ -678,7 +678,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "set -x; /data/local/tmp/dm --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android buildbucket_build_id 123454321 swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --dont_write pdf --nocpu --config gl gldft glsrgb glmsaa4 glnvprdit4 --src tests gm image colorImage svg --blacklist _ svg _ svgparse_ glsrgb image _ _ _ test _ GrShape _ 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 --nonativeFonts --verbose; echo $? >/data/local/tmp/rc", + "set -x; /data/local/tmp/dm --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android buildbucket_build_id 123454321 swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --dont_write pdf --nocpu --config gl gldft glsrgb glmsaa4 --src tests gm image colorImage svg --blacklist _ svg _ svgparse_ glsrgb image _ _ _ test _ GrShape _ 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 --nonativeFonts --verbose; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], "env": { diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 4d589d09f8..6b351265b6 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -169,7 +169,6 @@ "gldft", "glsrgb", "glmsaa8", - "glnvprdit8", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index fb4844b8e9..cfff7ae3f4 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -169,7 +169,6 @@ "gldft", "glsrgb", "glmsaa8", - "glnvprdit8", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index 1c34da98ef..4f0ad74cc1 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -169,7 +169,6 @@ "gldft", "glsrgb", "glmsaa8", - "glnvprdit8", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json index fc59c32e8f..f2fe4f1205 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json @@ -230,7 +230,6 @@ "gldft", "glsrgb", "glmsaa8", - "glnvprdit8", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 1edd249155..7e157e9172 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -157,15 +157,6 @@ def dm_flags(api, bot): if 'NexusPlayer' in bot: configs = [x for x in configs if 'dft' not in x] - if '-TSAN' not in bot and sample_count is not '': - if ('TegraK1' in bot or - 'TegraX1' in bot or - 'GTX550Ti' in bot or - 'GTX660' in bot or - 'QuadroP400' in bot or - ('GT610' in bot and 'Ubuntu17' not in bot)): - configs.append(gl_prefix + 'nvprdit' + sample_count) - # We want to test both the OpenGL config and the GLES config on Linux Intel: # GL is used by Chrome, GLES is used by ChromeOS. # Also do the Ganesh threading verification test (render with and without diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index 7e90730bfe..ec69235ccc 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -87,8 +87,6 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { "gles", "glnvpr8", "glnvpr4", - "glnvprdit8", - "glesnvprdit4", "pdf", "skp", "svg", @@ -102,7 +100,6 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { "glessrgb", "gl", "glnvpr4", - "glnvprdit4", "glsrgb", "glmsaa4", "vk", @@ -144,74 +141,65 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getSamples() == 4); REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseNVPR()); REPORTER_ASSERT(reporter, !configs[12]->asConfigGpu()->getUseDIText()); - REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getSamples() == 8); - REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseDIText()); - REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[14]->asConfigGpu()->getUseDIText()); + REPORTER_ASSERT(reporter, !configs[13]->asConfigGpu()); + REPORTER_ASSERT(reporter, !configs[14]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[15]->asConfigGpu()); REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu()); - REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu()); - REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu()); - REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); - REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorSpace()); - REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorSpace()->gammaIsLinear()); + REPORTER_ASSERT(reporter, configs[17]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[18]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[19]->asConfigGpu()); + REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu()); + REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[22]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); + REPORTER_ASSERT(reporter, configs[22]->asConfigGpu()->getColorSpace()); + REPORTER_ASSERT(reporter, configs[22]->asConfigGpu()->getColorSpace()->gammaIsLinear()); const SkMatrix44* srgbXYZ = srgbColorSpace->toXYZD50(); SkASSERT(srgbXYZ); - const SkMatrix44* config25XYZ = configs[24]->asConfigGpu()->getColorSpace()->toXYZD50(); + const SkMatrix44* config25XYZ = configs[22]->asConfigGpu()->getColorSpace()->toXYZD50(); SkASSERT(config25XYZ); REPORTER_ASSERT(reporter, *config25XYZ == *srgbXYZ); - REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); - REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); - REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); - REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorSpace()); - REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getColorSpace()->gammaIsLinear()); - const SkMatrix44* config41XYZ = configs[32]->asConfigGpu()->getColorSpace()->toXYZD50(); + REPORTER_ASSERT(reporter, configs[23]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); + REPORTER_ASSERT(reporter, configs[23]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); + REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getSamples() == 4); + REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getUseNVPR()); + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); + REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getSamples() == 4); +#ifdef SK_VULKAN + REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()); +#endif + REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); + REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorSpace()); + REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorSpace()->gammaIsLinear()); + const SkMatrix44* config41XYZ = configs[29]->asConfigGpu()->getColorSpace()->toXYZD50(); SkASSERT(config41XYZ); REPORTER_ASSERT(reporter, *config41XYZ != *srgbXYZ); - REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); - REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorSpace()); - REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getColorSpace()->gammaIsLinear()); - REPORTER_ASSERT(reporter, *configs[33]->asConfigGpu()->getColorSpace()->toXYZD50() != + REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); + REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace()); + REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace()->gammaIsLinear()); + REPORTER_ASSERT(reporter, *configs[30]->asConfigGpu()->getColorSpace()->toXYZD50() != *srgbColorSpace->toXYZD50()); - REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getContextType() == + REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getContextType() == GrContextFactory::kGL_ContextType); - REPORTER_ASSERT(reporter, SkToBool(configs[34]->asConfigGpu()->getContextOverrides() & + REPORTER_ASSERT(reporter, SkToBool(configs[31]->asConfigGpu()->getContextOverrides() & SkCommandLineConfigGpu::ContextOverrides::kAvoidStencilBuffers)); - REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getContextType() == + REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getContextType() == GrContextFactory::kMock_ContextType); - REPORTER_ASSERT(reporter, configs[19]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[20]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[21]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[37]->asConfigGpu()->getContextType() == + + REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getContextType() == GrContextFactory::kGL_ContextType); - REPORTER_ASSERT(reporter, configs[37]->asConfigGpu()->getColorType() == kARGB_4444_SkColorType); - REPORTER_ASSERT(reporter, configs[37]->asConfigGpu()->getAlphaType() == kPremul_SkAlphaType); - REPORTER_ASSERT(reporter, configs[38]->asConfigGpu()->getContextType() == + REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getColorType() == kARGB_4444_SkColorType); + REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getAlphaType() == kPremul_SkAlphaType); + REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getContextType() == GrContextFactory::kGL_ContextType); - REPORTER_ASSERT(reporter, configs[38]->asConfigGpu()->getColorType() == kRGB_565_SkColorType); - REPORTER_ASSERT(reporter, configs[38]->asConfigGpu()->getAlphaType() == kOpaque_SkAlphaType); - REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getUseDIText()); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); - REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[39]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[39]->asConfigGpu()->getTestThreading()); -#ifdef SK_VULKAN - REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()); -#endif + REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getColorType() == kRGB_565_SkColorType); + REPORTER_ASSERT(reporter, configs[35]->asConfigGpu()->getAlphaType() == kOpaque_SkAlphaType); + REPORTER_ASSERT(reporter, configs[36]->asConfigGpu()); + REPORTER_ASSERT(reporter, configs[36]->asConfigGpu()->getTestThreading()); #endif } diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 9d1c2ddadd..f9988f8769 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -42,10 +42,7 @@ static const struct { { "glesmsaa4", "gpu", "api=gles,samples=4" }, { "glnvpr4", "gpu", "api=gl,nvpr=true,samples=4" }, { "glnvpr8" , "gpu", "api=gl,nvpr=true,samples=8" }, - { "glnvprdit4", "gpu", "api=gl,nvpr=true,samples=4,dit=true" }, - { "glnvprdit8" , "gpu", "api=gl,nvpr=true,samples=8,dit=true" }, { "glesnvpr4", "gpu", "api=gles,nvpr=true,samples=4" }, - { "glesnvprdit4", "gpu", "api=gles,nvpr=true,samples=4,dit=true" }, { "gl4444", "gpu", "api=gl,color=4444" }, { "gl565", "gpu", "api=gl,color=565" }, { "glf16", "gpu", "api=gl,color=f16" }, |