From 874b5357daa72c9fcdc14fc425b63ebc2219c034 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 16 Mar 2018 08:48:24 -0400 Subject: Prevent crash when flushing while DDL recording Change-Id: I35e96d3c3020092b33d9b952394d40d4fd5a587b Reviewed-on: https://skia-review.googlesource.com/114685 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- tests/DeferredDisplayListTest.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/DeferredDisplayListTest.cpp') diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index b85388f9c9..f17957c9c8 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -445,5 +445,21 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DDLInvalidRecorder, reporter, ctxInfo) { } +// Ensure that flushing while DDL recording doesn't cause a crash +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DDLFlushWhileRecording, reporter, ctxInfo) { + GrContext* context = ctxInfo.grContext(); + + SkImageInfo ii = SkImageInfo::MakeN32Premul(32, 32); + sk_sp s = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, ii); + + SkSurfaceCharacterization characterization; + SkAssertResult(s->characterize(&characterization)); + + SkDeferredDisplayListRecorder recorder(characterization); + SkCanvas* canvas = recorder.getCanvas(); + + canvas->flush(); + canvas->getGrContext()->flush(); +} #endif -- cgit v1.2.3