From 8a6697af95b340aad6dee7e6228048fa305c1e59 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 30 Sep 2015 12:11:07 -0700 Subject: Fix for nexus 5 crashing in GL benches GLBenches do not expect gl state to change between onPerCanvasPreDraw and *PostDraw, but we do a clear and sometimes we clear as draw. This causes us to bind vertex objects / programs / etc. This change creates two new virtual methods which are called right before and immediately after timing. BUG=skia: Review URL: https://codereview.chromium.org/1379853003 --- bench/Benchmark.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bench/Benchmark.cpp') diff --git a/bench/Benchmark.cpp b/bench/Benchmark.cpp index bf622b0683..98fec2e7aa 100644 --- a/bench/Benchmark.cpp +++ b/bench/Benchmark.cpp @@ -33,14 +33,22 @@ SkIPoint Benchmark::getSize() { return this->onGetSize(); } -void Benchmark::preDraw() { - this->onPreDraw(); +void Benchmark::delayedSetup() { + this->onDelayedSetup(); } void Benchmark::perCanvasPreDraw(SkCanvas* canvas) { this->onPerCanvasPreDraw(canvas); } +void Benchmark::preDraw(SkCanvas* canvas) { + this->onPreDraw(canvas); +} + +void Benchmark::postDraw(SkCanvas* canvas) { + this->onPostDraw(canvas); +} + void Benchmark::perCanvasPostDraw(SkCanvas* canvas) { this->onPerCanvasPostDraw(canvas); } -- cgit v1.2.3