From eaa90b2a1acce598627250bc68ebc216d2b17e7c Mon Sep 17 00:00:00 2001
From: Robert Phillips <robertphillips@google.com>
Date: Tue, 1 Aug 2017 10:36:36 -0400
Subject: 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>
---
 dm/DM.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dm/DM.cpp')

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
-- 
cgit v1.2.3