Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

1 files changed, 5 insertions, 11 deletions

diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 295e106621..1118bc23a7 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -58,13 +58,11 @@ void GLFWView::initialize(mbgl::Map *map_) {
 
     glfwSetWindowUserPointer(window, this);
     glfwMakeContextCurrent(window);
+    glfwSwapInterval(1);
 
     int width, height;
     glfwGetWindowSize(window, &width, &height);
-    int fbWidth, fbHeight;
-    glfwGetFramebufferSize(window, &fbWidth, &fbHeight);
-
-    resize(window, 0, 0);
+    resize(window, width, height);
 
     glfwSetCursorPosCallback(window, mouseMove);
     glfwSetMouseButtonCallback(window, mouseClick);
@@ -281,12 +279,6 @@ int GLFWView::run() {
     map->start();
 
     while (!glfwWindowShouldClose(window)) {
-        if (map->needsSwap()) {
-            glfwSwapBuffers(window);
-            map->swapped();
-            fps();
-        }
-
         glfwWaitEvents();
     }
 
@@ -310,7 +302,9 @@ void GLFWView::notify() {
 }
 
 void GLFWView::swap() {
-    glfwPostEmptyEvent();
+    glfwSwapBuffers(window);
+    map->swapped();
+    fps();
 }
 
 void GLFWView::notifyMapChange(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) {