fix -Wfor-loop-analysis and -Wreorder warnings (#15901)

2 files changed, 5 insertions, 4 deletions

diff --git a/render-test/metadata.hpp b/render-test/metadata.hpp
index 567c89e3fc..2b007a445c 100644
--- a/render-test/metadata.hpp
+++ b/render-test/metadata.hpp
@@ -100,14 +100,14 @@ struct GfxProbe {
     GfxProbe() = default;
     GfxProbe(const mbgl::gfx::RenderingStats&, const GfxProbe&);
 
-    int numDrawCalls;
-    int numTextures;
     int numBuffers;
+    int numDrawCalls;
     int numFrameBuffers;
+    int numTextures;
 
-    Memory memTextures;
     Memory memIndexBuffers;
     Memory memVertexBuffers;
+    Memory memTextures;
 };
 
 class TestMetrics {
diff --git a/render-test/runner.cpp b/render-test/runner.cpp
index 8a4b0b3b0e..0389b83575 100644
--- a/render-test/runner.cpp
+++ b/render-test/runner.cpp
@@ -1035,7 +1035,8 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata, R
 
         map.flyTo(mbgl::CameraOptions().withCenter(endPos).withZoom(endZoom), animationOptions);
 
-        for (; !transitionFinished; frames++) {
+        while (!transitionFinished) {
+            frames++;
             frontend.renderOnce(map);
             float frameTime = (float)frontend.getFrameTime();
             totalTime += frameTime;