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/ImageFilterCollapse.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bench/ImageFilterCollapse.cpp') diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp index 4024750dc3..010149b2bc 100644 --- a/bench/ImageFilterCollapse.cpp +++ b/bench/ImageFilterCollapse.cpp @@ -83,7 +83,7 @@ protected: return "image_filter_collapse_table"; } - virtual void onPreDraw() override { + virtual void onDelayedSetup() override { for (int i = 0; i < 256; ++i) { int n = i >> 5; table1[i] = (n << 5) | (n << 2) | (n >> 1); @@ -139,7 +139,7 @@ protected: return "image_filter_collapse_matrix"; } - virtual void onPreDraw() override { + virtual void onDelayedSetup() override { SkColorFilter* colorFilters[] = { make_brightness(0.1f), make_grayscale(), -- cgit v1.2.3