diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-19 16:08:18 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-01 09:15:05 -0800 |
| commit | 58886842bc381cd30bac7102d4f70497c0128aa7 (patch) | |
| tree | 572ffb0f76aa4bcb6a86ef4ea506335adf636309 /include | |
| parent | 40ebf5d0d08138c353d7c0e4bc61ee53dceae410 (diff) | |
| download | qtlocation-mapboxgl-58886842bc381cd30bac7102d4f70497c0128aa7.tar.gz | |
[core] Move MapData storage to MapContext
This allows MapData members to hold GL resources which must be released
on the MapContext thread -- necessary for the following commit.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 8401976e15..bce99ebe4d 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -178,8 +178,8 @@ public: private: View& view; const std::unique_ptr<Transform> transform; - const std::unique_ptr<MapData> data; const std::unique_ptr<util::Thread<MapContext>> context; + MapData* data; enum class RenderState { never, |