Clear GL context before Gr context (flutter#20957)

engine-flutter-autoroll · Sep 2, 2020 · 61e057a · 61e057a
1 parent 80f4481
commit 61e057a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -467,16 +467,19 @@ RasterStatus Rasterizer::DrawToSurface(flutter::LayerTree& layer_tree) {
 
     FireNextFrameCallbackIfPresent();
 
-    if (surface_->GetContext()) {
-      TRACE_EVENT0("flutter", "PerformDeferredSkiaCleanup");
-      surface_->GetContext()->performDeferredCleanup(kSkiaCleanupExpiration);
-    }
-
     // Clear the render context after submitting the frame.
     // This ensures that the GL context is released after drawing to the
     // surface.
+    //
+    // The GL context must be clear before performing Gr context deferred
+    // cleanup.
     surface_->ClearRenderContext();
 
+    if (surface_->GetContext()) {
+      TRACE_EVENT0("flutter", "PerformDeferredSkiaCleanup");
+      surface_->GetContext()->performDeferredCleanup(kSkiaCleanupExpiration);
+    }
+
     return raster_status;
   }