guard against concurrent OpenGL extension loading

2 files changed, 2 insertions, 4 deletions

diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index eb5f295eaf..d02d43e58a 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -54,8 +54,6 @@ public:
 private:
     EGLConfig chooseConfig(const EGLConfig configs[], EGLint numConfigs);
 
-    void loadExtensions();
-
     bool inEmulator();
 
 private:
@@ -80,8 +78,6 @@ private:
 
     bool firstTime = false;
 
-    bool usingDepth24 = false;
-
     bool fpsEnabled = false;
     double fps = 0.0;
 };
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index ba318c2b41..5d0e55d69a 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -60,6 +60,8 @@ private:
     GLXPbuffer glxPbuffer = 0;
 #endif
 
+    bool extensionsLoaded = false;
+
     GLuint fbo = 0;
     GLuint fboDepthStencil = 0;
     GLuint fboColor = 0;