aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-08-01 10:36:36 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-01 17:08:03 +0000
commiteaa90b2a1acce598627250bc68ebc216d2b17e7c (patch)
treefaea090c0f4b1f70a6e154fa1db25fcc9b3acd70 /dm
parent876aed8758b7109574999ffac43b1ea47f359bd7 (diff)
Roll ANGLE
https://chromium.googlesource.com/angle/angle.git/+log/cce8965d2c58..878c8b1e5e89 ANGLE now crashes (on program compilation) if there isn't a flush between uses of different flavors of ANGLE context (e.g., angle_gl_es2 vs. angle_gl_es3). Change-Id: If59b6ec683e682db5214bb002a70863cee5fe013 Reviewed-on: https://skia-review.googlesource.com/28865 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 8be3fbc05e..a677cae235 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1450,11 +1450,13 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex
ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType)));
if (ctxInfo.grContext()) {
(*test)(reporter, ctxInfo);
+ ctxInfo.grContext()->flush();
}
ctxInfo = factory->getContextInfo(contextType,
GrContextFactory::ContextOverrides::kRequireNVPRSupport);
if (ctxInfo.grContext()) {
(*test)(reporter, ctxInfo);
+ ctxInfo.grContext()->flush();
}
}
#endif