Add gyp define to enable vulkan debug layers
On Debug vulkan bots, running with the debug layers on seems to be adding
more than an hour to the total running time. Since we suppress any output
on the bots anyways the debug layers are serving no purpose. Thus I am
adding a gyp define to disable the layers on the bot.
With this change, by default when running vulkan in Debug, the debug_layers
will be enabled. The bots should disable the layers. Android framework
should also have them disabled by default.
TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2185953003
Review-Url: https://codereview.chromium.org/2185953003
diff --git a/gyp/common.gypi b/gyp/common.gypi
index b8ea389..b350963 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -70,6 +70,13 @@
'SK_VULKAN',
],
},
+ 'conditions': [
+ [ 'skia_vulkan_debug_layers', {
+ 'configurations': {
+ 'Debug': { 'defines': [ 'SK_ENABLE_VK_LAYERS' ] },
+ },
+ }],
+ ],
}],
[ 'skia_command_buffer', {
'defines': [
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index acd187c..68d5072 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -83,6 +83,7 @@
'skia_use_android_framework_defines%': 1,
'skia_use_system_json%': 1,
'skia_vulkan%': 1,
+ 'skia_vulkan_debug_layers%': 0,
}, {
'skia_os%': '<(skia_os)',
'skia_chrome_utils%': 1,
@@ -145,6 +146,7 @@
'skia_pdf%': 1,
'skia_profile_enabled%': 0,
'skia_vulkan%': 0,
+ 'skia_vulkan_debug_layers%': 1,
'skia_win_debuggers_path%': '',
'skia_shared_lib%': 0,
'skia_force_distance_field_text%': 0,
@@ -226,6 +228,7 @@
'skia_gdi%': '<(skia_gdi)',
'skia_gpu%': '<(skia_gpu)',
'skia_vulkan%': '<(skia_vulkan)',
+ 'skia_vulkan_debug_layers%': '<(skia_vulkan_debug_layers)',
'skia_win_exceptions%': 0,
'skia_win_ltcg%': '<(skia_is_bot)',
'skia_osx_deployment_target%': '<(skia_osx_deployment_target)',
diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h
index 608df83..9942016 100644
--- a/include/gpu/vk/GrVkBackendContext.h
+++ b/include/gpu/vk/GrVkBackendContext.h
@@ -12,10 +12,6 @@
#include "vk/GrVkDefines.h"
-#ifdef SK_DEBUG
-#define ENABLE_VK_LAYERS
-#endif
-
struct GrVkInterface;
enum GrVkExtensionFlags {
diff --git a/infra/bots/recipe_modules/skia/fake_specs.py b/infra/bots/recipe_modules/skia/fake_specs.py
index 6390ba2..776ce40 100644
--- a/infra/bots/recipe_modules/skia/fake_specs.py
+++ b/infra/bots/recipe_modules/skia/fake_specs.py
@@ -583,9 +583,9 @@
'do_test_steps': False,
'env': {
'GYP_DEFINES':
- ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warn'
- 'ings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg'
- '=0'),
+ ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulk'
+ 'an_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_pa'
+ 'th=c:/DbgHelp skia_win_ltcg=0'),
},
'nanobench_flags': [
'--dummy-flags',
@@ -936,7 +936,8 @@
'do_test_steps': True,
'env': {
'GYP_DEFINES':
- 'skia_arch_type=arm64 skia_vulkan=1 skia_warnings_as_errors=0',
+ ('skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 ski'
+ 'a_warnings_as_errors=0'),
},
'nanobench_flags': [
'--dummy-flags',
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index fd18b40..fd1ee84 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -101,7 +101,7 @@
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
@@ -135,7 +135,7 @@
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"CHROME_PATH": "[SLAVE_BUILD]\\src",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
+ "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan",
"VK_SDK_PATH": "[SLAVE_BUILD]\\vulkan_1.0.17.0"
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index 45c82e5..15216ae 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -246,7 +246,7 @@
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
index 2ea683f..3aadb90 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
@@ -251,7 +251,7 @@
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_vulkan=1 skia_warnings_as_errors=0\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=0\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
diff --git a/src/gpu/vk/GrVkBackendContext.cpp b/src/gpu/vk/GrVkBackendContext.cpp
index e859b19..a2165b4 100644
--- a/src/gpu/vk/GrVkBackendContext.cpp
+++ b/src/gpu/vk/GrVkBackendContext.cpp
@@ -13,7 +13,7 @@
////////////////////////////////////////////////////////////////////////////////
// Helper code to set up Vulkan context objects
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
const char* kDebugLayerNames[] = {
// elements of VK_LAYER_LUNARG_standard_validation
"VK_LAYER_GOOGLE_threading",
@@ -62,7 +62,7 @@
SkTArray<const char*> instanceLayerNames;
SkTArray<const char*> instanceExtensionNames;
uint32_t extensionFlags = 0;
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
for (size_t i = 0; i < SK_ARRAY_COUNT(kDebugLayerNames); ++i) {
if (extensions.hasInstanceLayer(kDebugLayerNames[i])) {
instanceLayerNames.push_back(kDebugLayerNames[i]);
@@ -172,7 +172,7 @@
SkTArray<const char*> deviceLayerNames;
SkTArray<const char*> deviceExtensionNames;
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
for (size_t i = 0; i < SK_ARRAY_COUNT(kDebugLayerNames); ++i) {
if (extensions.hasDeviceLayer(kDebugLayerNames[i])) {
deviceLayerNames.push_back(kDebugLayerNames[i]);
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 7fddd4b..724a50d 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -44,7 +44,7 @@
#define VK_CALL_RET(RET, X) GR_VK_CALL_RET(this->vkInterface(), RET, X)
#define VK_CALL_ERRCHECK(X) GR_VK_CALL_ERRCHECK(this->vkInterface(), X)
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(
VkDebugReportFlagsEXT flags,
VkDebugReportObjectTypeEXT objectType,
@@ -93,7 +93,7 @@
, fResourceProvider(this) {
fBackendContext.reset(backendCtx);
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
fCallback = VK_NULL_HANDLE;
if (backendCtx->fExtensions & kEXT_debug_report_GrVkExtensionFlag) {
// Setup callback creation information
@@ -191,7 +191,7 @@
shaderc_compiler_release(fCompiler);
#endif
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
if (fCallback) {
VK_CALL(DestroyDebugReportCallbackEXT(fBackendContext->fInstance, fCallback, nullptr));
fCallback = VK_NULL_HANDLE;
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index 37d4e4f..a0bed3b 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -250,7 +250,7 @@
SkAutoTDelete<GrVkHeap> fHeaps[kHeapCount];
-#ifdef ENABLE_VK_LAYERS
+#ifdef SK_ENABLE_VK_LAYERS
// For reporting validation layer errors
VkDebugReportCallbackEXT fCallback;
#endif
diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 9ed180b..27d3124 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -77,10 +77,10 @@
"image",
"gen_platf",
"frame_larger_than_image.gif",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -88,14 +88,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -217,6 +209,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa4",
"nvpr4",
"nvprdit4",
@@ -293,10 +287,10 @@
"image",
"_",
"_",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -304,14 +298,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -348,6 +334,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -431,6 +425,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa4",
"nvpr4",
"nvprdit4",
@@ -507,10 +503,10 @@
"image",
"_",
"_",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -518,14 +514,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -562,6 +550,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -645,6 +641,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa4",
"nvpr4",
"nvprdit4",
@@ -724,22 +722,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -776,11 +762,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -859,6 +845,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -936,22 +924,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -988,11 +964,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -1071,6 +1047,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -1150,22 +1128,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -1202,11 +1168,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -1285,6 +1251,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -1409,22 +1377,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -1461,6 +1417,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -1544,6 +1508,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -1669,22 +1635,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -1721,6 +1675,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -1804,6 +1766,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -1929,22 +1893,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -1981,6 +1933,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -2064,6 +2024,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -2139,22 +2101,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -2191,11 +2141,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -2274,6 +2224,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -2350,10 +2302,10 @@
"image",
"_",
"_",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -2361,14 +2313,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -2405,6 +2349,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -2576,6 +2528,21 @@
"true",
"--useThermalManager",
"1,1,10,1000",
+ "--scales",
+ "1.0",
+ "1.1",
+ "--config",
+ "565",
+ "8888",
+ "gpu",
+ "nonrendering",
+ "angle",
+ "hwui",
+ "f16",
+ "srgb",
+ "msaa4",
+ "nvpr4",
+ "nvprdit4",
"--match",
"~blurroundrect",
"~patch_grid",
@@ -2658,22 +2625,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -2710,11 +2665,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -2888,6 +2843,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -3010,10 +2967,10 @@
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
- "serialize-8888",
+ "_",
"gm",
"_",
- "not_native32_bitmap_config",
+ "fontscalerdistortable",
"serialize-8888",
"gm",
"_",
@@ -3021,14 +2978,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -3065,6 +3014,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -3244,6 +3201,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -3323,10 +3282,10 @@
"image",
"_",
"_",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -3334,14 +3293,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -3378,6 +3329,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -3564,6 +3523,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"--match",
"~blurroundrect",
"~patch_grid",
@@ -3641,10 +3602,10 @@
"image",
"_",
"_",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -3652,14 +3613,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -3696,6 +3649,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -3876,6 +3837,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa4",
"nvpr4",
"nvprdit4",
@@ -3984,22 +3947,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -4033,14 +3984,6 @@
"gm",
"_",
"fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
"sp-8888",
"gm",
"_",
@@ -4216,6 +4159,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -4329,22 +4274,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -4378,14 +4311,6 @@
"gm",
"_",
"fontmgr_iter",
- "serialize-8888",
- "gm",
- "_",
- "verylargebitmap",
- "serialize-8888",
- "gm",
- "_",
- "verylarge_picture_image",
"sp-8888",
"gm",
"_",
@@ -4541,7 +4466,11 @@
"_",
"image",
"_",
- "abnormal.wbmp"
+ "abnormal.wbmp",
+ "msaa16",
+ "gm",
+ "_",
+ "blurcircles"
],
"do_perf_steps": false,
"do_test_steps": true,
@@ -4565,6 +4494,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -4650,22 +4581,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -4702,11 +4621,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -4788,6 +4707,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -4875,22 +4796,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -4927,11 +4836,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -5013,6 +4922,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -5099,22 +5010,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -5151,11 +5050,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -5234,6 +5133,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -5320,22 +5221,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -5372,11 +5261,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -5456,6 +5345,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -5542,22 +5433,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -5594,11 +5473,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -5678,6 +5557,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -5764,22 +5645,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -5816,11 +5685,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -5899,6 +5768,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -6003,22 +5874,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -6055,11 +5914,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -6235,6 +6094,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -6359,22 +6220,10 @@
"serialize-8888",
"gm",
"_",
- "not_native32_bitmap_config",
- "serialize-8888",
- "gm",
- "_",
"bleed_image",
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -6411,6 +6260,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -6572,7 +6429,7 @@
"do_perf_steps": false,
"do_test_steps": true,
"env": {
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
+ "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
},
"nanobench_flags": [
"--pre_log",
@@ -6583,15 +6440,7 @@
"1.0",
"1.1",
"--config",
- "565",
- "8888",
- "gpu",
- "nonrendering",
- "angle",
- "hwui",
- "msaa16",
- "nvpr16",
- "nvprdit16",
+ "vk",
"--match",
"~interlaced1.png",
"~interlaced2.png",
@@ -6715,10 +6564,10 @@
"gm",
"_",
"composeshader_bitmap",
- "serialize-8888",
+ "_",
"gm",
"_",
- "not_native32_bitmap_config",
+ "fontscalerdistortable",
"serialize-8888",
"gm",
"_",
@@ -6726,14 +6575,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -6770,6 +6611,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -6853,6 +6702,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -6979,10 +6830,10 @@
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
- "serialize-8888",
+ "_",
"gm",
"_",
- "not_native32_bitmap_config",
+ "fontscalerdistortable",
"serialize-8888",
"gm",
"_",
@@ -6990,14 +6841,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -7034,6 +6877,14 @@
"serialize-8888",
"gm",
"_",
+ "bleed_alpha_image",
+ "serialize-8888",
+ "gm",
+ "_",
+ "bleed_alpha_image_shader",
+ "serialize-8888",
+ "gm",
+ "_",
"verylargebitmap",
"serialize-8888",
"gm",
@@ -7213,6 +7064,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
@@ -7335,10 +7188,10 @@
"image",
"gen_platf",
"frame_larger_than_image.gif",
- "serialize-8888",
- "gm",
"_",
- "not_native32_bitmap_config",
+ "test",
+ "_",
+ "GrShape",
"serialize-8888",
"gm",
"_",
@@ -7346,14 +7199,6 @@
"serialize-8888",
"gm",
"_",
- "bleed_alpha_image",
- "serialize-8888",
- "gm",
- "_",
- "bleed_alpha_image_shader",
- "serialize-8888",
- "gm",
- "_",
"c_gms",
"serialize-8888",
"gm",
@@ -7390,11 +7235,11 @@
"serialize-8888",
"gm",
"_",
- "verylargebitmap",
+ "bleed_alpha_image",
"serialize-8888",
"gm",
"_",
- "verylarge_picture_image",
+ "bleed_alpha_image_shader",
"sp-8888",
"gm",
"_",
@@ -7572,6 +7417,8 @@
"nonrendering",
"angle",
"hwui",
+ "f16",
+ "srgb",
"msaa16",
"nvpr16",
"nvprdit16",
diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index ddaebcc..0b1dba6 100755
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -172,6 +172,7 @@
# Vulkan.
if builder_dict.get('extra_config') == 'Vulkan':
gyp_defs['skia_vulkan'] = '1'
+ gyp_defs['skia_vulkan_debug_layers'] = '0'
return gyp_defs