[glfw] Set viewport size from the Map thread

Setting the viewport size from the main thread has no affect
on Linux and thus, the map doesn't scale. We now set the
viewport size on the beforeRender() hook that gets called
from the Map thread.

1 files changed, 5 insertions, 5 deletions

diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index c83e6c324b..9cb0ce69d9 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -81,8 +81,6 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
     glfwGetFramebufferSize(window, &fbWidth, &fbHeight);
     pixelRatio = static_cast<float>(fbWidth) / width;
 
-    glViewport(0, 0, fbWidth, fbHeight);
-
     glfwMakeContextCurrent(nullptr);
 
     printf("\n");
@@ -333,8 +331,6 @@ void GLFWView::onFramebufferResize(GLFWwindow *window, int width, int height) {
     view->fbWidth = width;
     view->fbHeight = height;
 
-    glViewport(0, 0, width, height);
-
     view->map->update(mbgl::Update::Repaint);
 }
 
@@ -434,7 +430,11 @@ void GLFWView::invalidate() {
 }
 
 void GLFWView::beforeRender() {
-    // no-op
+    // This is called from the map thread but `width` and `height`
+    // can be accessed with no race because the main thread is blocked
+    // when we render. This will be more straightforward when we move
+    // rendering to the main thread.
+    glViewport(0, 0, width, height);
 }
 
 void GLFWView::afterRender() {