2 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
index 25c3db2e49..2c9fac0131 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
@@ -72,7 +72,6 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*
         // Flag the depth buffer as no longer needing to be cleared for the remainder of this pass.
         parameters.staticData.depthRenderbuffer->setShouldClear(false);
 
-        glContext.setStencilMode(gfx::StencilMode::disabled());
         glContext.clear(Color{ 0.0f, 0.0f, 0.0f, 0.0f }, depthClearValue, {});
 
         auto draw = [&](auto& programInstance, const auto& tileBucket, auto&& uniformValues,
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index f5d72712b6..c58f4a091d 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -310,13 +310,6 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
 
     backend.updateAssumedState();
 
-    // TODO: remove cast
-    gl::Context& glContext = static_cast<gl::Context&>(parameters.context);
-
-    if (parameters.contextMode == GLContextMode::Shared) {
-        glContext.setDirtyState();
-    }
-   
     // Set render tiles to the render items.
     for (auto& renderItem : renderItems) {
         if (!renderItem.source) {
@@ -372,6 +365,15 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
         }
     }
 
+    const auto encoder = parameters.context.createCommandEncoder();
+
+    // TODO: remove cast
+    gl::Context& glContext = static_cast<gl::Context&>(parameters.context);
+
+    if (parameters.contextMode == GLContextMode::Shared) {
+        glContext.setDirtyState();
+    }
+
     // - UPLOAD PASS -------------------------------------------------------------------------------
     // Uploads all required buffers and images before we do any actual rendering.
     {
@@ -595,8 +597,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
         observer->onDidFinishRenderingMap();
     }
 
-    // Cleanup only after signaling completion
-    parameters.context.performCleanup();
+    // CommandEncoder destructor submits render commands.
 }
 
 void  Renderer::Impl::flush() {