From a91d5ad7da1eda4b07adb707a4b51001613db958 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 28 Apr 2016 01:12:41 +0300 Subject: [PATCH] [Qt] Initialize GL extensions It will also enable Vertex Array Objects. --- platform/qt/include/qmapbox.hpp | 4 ++++ platform/qt/src/qmapbox.cpp | 15 +++++++++++++++ platform/qt/src/qquickmapboxglrenderer.cpp | 2 ++ 3 files changed, 21 insertions(+) diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index 52bb6da50..0834046d7 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/platform/qt/include/qmapbox.hpp @@ -60,6 +60,10 @@ typedef void (*CustomLayerInitializeFunction)(void* context) ; typedef void (*CustomLayerRenderFunction)(void* context, const CustomLayerRenderParameters&); typedef void (*CustomLayerDeinitializeFunction)(void* context); +#if QT_VERSION >= 0x050000 +Q_DECL_EXPORT void initializeGLExtensions(); +#endif + } Q_DECLARE_METATYPE(QMapbox::Coordinate); diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index 2929d07cd..143891c4a 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/platform/qt/src/qmapbox.cpp @@ -1,8 +1,13 @@ +#include #include #include #include +#if QT_VERSION >= 0x050000 +#include +#endif + namespace QMapbox { Q_DECL_EXPORT NetworkMode networkMode() @@ -44,4 +49,14 @@ Q_DECL_EXPORT QList>& defaultStyles() return styles; } +#if QT_VERSION >= 0x050000 +Q_DECL_EXPORT void initializeGLExtensions() +{ + mbgl::gl::InitializeExtensions([](const char* name) { + QOpenGLContext* thisContext = QOpenGLContext::currentContext(); + return thisContext->getProcAddress(name); + }); +} +#endif + } diff --git a/platform/qt/src/qquickmapboxglrenderer.cpp b/platform/qt/src/qquickmapboxglrenderer.cpp index 8a5c2e32a..fc98cf35e 100644 --- a/platform/qt/src/qquickmapboxglrenderer.cpp +++ b/platform/qt/src/qquickmapboxglrenderer.cpp @@ -10,6 +10,8 @@ QQuickMapboxGLRenderer::QQuickMapboxGLRenderer() { + QMapbox::initializeGLExtensions(); + QMapboxGLSettings settings; settings.setAccessToken(qgetenv("MAPBOX_ACCESS_TOKEN")); settings.setCacheDatabasePath("/tmp/mbgl-cache.db");