aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-03-26 10:41:02 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-26 10:41:02 -0700
commite0b19d4985846d64bb581013828a9dc5af401a5d (patch)
tree5be55d6c2948e72ab227cc10f4ba4799341aca77 /bench
parent9665eee8d5ddc2ef644b062069f29a73d5dde077 (diff)
small fix for nanobench segfault when not running any tests
Diffstat (limited to 'bench')
-rw-r--r--bench/nanobench.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 920979cbf9..5e059328ad 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -894,6 +894,12 @@ int nanobench_main() {
log->config("meta");
log->metric("max_rss_mb", sk_tools::getMaxResidentSetSizeMB());
+#if SK_SUPPORT_GPU
+ // Make sure we clean up the global GrContextFactory here, otherwise we might race with the
+ // SkEventTracer destructor
+ gGrFactory.reset(NULL);
+#endif
+
return 0;
}