diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-15 17:22:38 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:17 +0100 |
| commit | ed270e4755727da81ee16d210d24575885abc6b7 (patch) | |
| tree | a377ceaa420d9280082e5825f4f6b3b2f6e0d19b | |
| parent | 39a7992b4de5323e7cda1ced3154ebab61e81339 (diff) | |
disable Skia resource leak checking on exit
This is normally enabled in Skia debug builds and it asserts if there
is a problem, which there is with a number of our unittests that leak
something (usually a VirtualDevice). Those are non-trivial to find
and don't matter in practice (or if they do they should be fixed
for all VCL backends), so just disable the Skia check.
Change-Id: I0a0721d8a3f0f961e14513574f4b3cc88ec1e62c
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
| -rw-r--r-- | external/skia/no-trace-resources-on-exit.patch.1 | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index c3988042a012..1fab368cc34b 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -18,6 +18,7 @@ skia_patches := \ fix-ddi.patch \ make-api-visible.patch.1 \ fix-shader-locale.patch.1 \ + no-trace-resources-on-exit.patch.1 \ share-grcontext.patch.1 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/no-trace-resources-on-exit.patch.1 b/external/skia/no-trace-resources-on-exit.patch.1 new file mode 100644 index 000000000000..7a8567938eba --- /dev/null +++ b/external/skia/no-trace-resources-on-exit.patch.1 @@ -0,0 +1,26 @@ +diff --git a/src/gpu/vk/GrVkCommandPool.h b/src/gpu/vk/GrVkCommandPool.h +index fd44d62e94..f9e90f185f 100644 +--- a/src/gpu/vk/GrVkCommandPool.h ++++ b/src/gpu/vk/GrVkCommandPool.h +@@ -41,7 +41,7 @@ public: + // returns true if close() has not been called + bool isOpen() const { return fOpen; } + +-#ifdef SK_DEBUG ++#ifdef SK_TRACE_VK_RESOURCES + void dumpInfo() const override { + SkDebugf("GrVkCommandPool: %p (%d refs)\n", fCommandPool, this->getRefCnt()); + } +diff --git a/src/gpu/vk/GrVkResource.h b/src/gpu/vk/GrVkResource.h +index 7b9949ba1b..4e8fb48c7c 100644 +--- a/src/gpu/vk/GrVkResource.h ++++ b/src/gpu/vk/GrVkResource.h +@@ -17,7 +17,7 @@ class GrVkGpu; + + // uncomment to enable tracing of resource refs + #ifdef SK_DEBUG +-#define SK_TRACE_VK_RESOURCES ++//#define SK_TRACE_VK_RESOURCES + #endif + + /** \class GrVkResource |