[core] Skip calculations when we already know we need rendering or layout

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp
index 9b0b512bf9..c8918fc2ee 100644
--- a/src/mbgl/renderer/render_style.cpp
+++ b/src/mbgl/renderer/render_style.cpp
@@ -203,14 +203,15 @@ void RenderStyle::update(const UpdateParameters& parameters) {
                 continue;
             }
 
-            if (getRenderLayer(layer->id)->needsRendering(zoomHistory.lastZoom)) {
+            if (!needsRendering && getRenderLayer(layer->id)->needsRendering(zoomHistory.lastZoom)) {
                 needsRendering = true;
             }
 
-            if (hasLayoutDifference(layerDiff, layer->id) ||
+            if (!needsRelayout && (
+                hasLayoutDifference(layerDiff, layer->id) ||
                 !imageDiff.added.empty() ||
                 !imageDiff.removed.empty() ||
-                !imageDiff.changed.empty()) {
+                !imageDiff.changed.empty())) {
                 needsRelayout = true;
             }