4 files changed, 9 insertions, 16 deletions

diff --git a/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp
index 04126990b3..d23f0861f4 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.cpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.cpp
@@ -49,7 +49,7 @@ void CircleBucket::addFeature(const GeometryTileFeature& feature,
             // Do not include points that are outside the tile boundaries.
             // Include all points in Still mode. You need to include points from
             // neighbouring tiles so that they are not clipped at tile boundaries.
-            if ((mode != MapMode::Still) &&
+            if ((mode == MapMode::Continuous) &&
                 (x < 0 || x >= util::EXTENT || y < 0 || y >= util::EXTENT)) continue;
 
             if (segments.empty() || segments.back().vertexLength + vertexLength > std::numeric_limits<uint16_t>::max()) {
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index e7b022f3ee..fe2e7cd42d 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -63,7 +63,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) {
             parameters.context,
             gl::Triangles(),
             parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly),
-            parameters.mapMode == MapMode::Still
+            parameters.mapMode != MapMode::Continuous
                 ? parameters.stencilModeForClipping(tile.clip)
                 : gl::StencilMode::disabled(),
             parameters.colorModeForRenderPass(),
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index e194c9c857..04fcb2c3ab 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -88,18 +88,13 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                          const auto& binders,
                          const auto& paintProperties)
         {
-            // We clip symbols to their tile extent in still mode.
-            const bool needsClipping = false; // TODO parameters.mapMode == MapMode::Still;
-
             program.get(paintProperties).draw(
                 parameters.context,
                 gl::Triangles(),
                 values_.pitchAlignment == AlignmentType::Map
                     ? parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly)
                     : gl::DepthMode::disabled(),
-                needsClipping
-                    ? parameters.stencilModeForClipping(tile.clip)
-                    : gl::StencilMode::disabled(),
+                gl::StencilMode::disabled(),
                 parameters.colorModeForRenderPass(),
                 std::move(uniformValues),
                 *buffers.vertexBuffer,
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index 529d1f438d..5d0ffed65f 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -59,7 +59,7 @@ Renderer::Impl::Impl(RendererBackend& backend_,
     , layerImpls(makeMutable<std::vector<Immutable<style::Layer::Impl>>>())
     , renderLight(makeMutable<Light::Impl>())
     , crossTileSymbolIndex(std::make_unique<CrossTileSymbolIndex>())
-    , placement(std::make_unique<Placement>(TransformState{}, MapMode::Still)) {
+    , placement(std::make_unique<Placement>(TransformState{}, MapMode::Static)) {
     glyphManager->setObserver(this);
 }
 
@@ -83,7 +83,7 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) {
 }
 
 void Renderer::Impl::render(const UpdateParameters& updateParameters) {
-    if (updateParameters.mode == MapMode::Still) {
+    if (updateParameters.mode != MapMode::Continuous) {
         // Don't load/render anyting in still mode until explicitly requested.
         if (!updateParameters.stillImageRequest) {
             return;
@@ -260,7 +260,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
     };
 
     bool loaded = updateParameters.styleLoaded && isLoaded();
-    if (updateParameters.mode == MapMode::Still && !loaded) {
+    if (updateParameters.mode != MapMode::Continuous && !loaded) {
         return;
     }
 
@@ -355,10 +355,8 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
                 sortedTilesForInsertion.emplace_back(tile);
                 tile.used = true;
 
-                // We only need clipping when we're _not_ drawing a symbol layer. The only exception
-                // for symbol layers is when we're rendering still images. See render_symbol_layer.cpp
-                // for the exception we make there.
-                if (!symbolLayer || parameters.mapMode == MapMode::Still) {
+                // We only need clipping when we're _not_ drawing a symbol layer.
+                if (!symbolLayer) {
                     tile.needsClipping = true;
                 }
             }
@@ -368,7 +366,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
     }
 
     bool symbolBucketsChanged = false;
-    if (parameters.mapMode == MapMode::Still) {
+    if (parameters.mapMode != MapMode::Continuous) {
         // TODO: Think about right way for symbol index to handle still rendering
         crossTileSymbolIndex->reset();
     }