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 /test | |
| 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 'test')
| -rw-r--r-- | test/miscellaneous/map_context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/miscellaneous/map_context.cpp b/test/miscellaneous/map_context.cpp index fac21ee959..9645572358 100644 --- a/test/miscellaneous/map_context.cpp +++ b/test/miscellaneous/map_context.cpp @@ -13,9 +13,9 @@ TEST(MapContext, DoubleStyleLoad) { std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>(); HeadlessView view(display, 1, 512, 512); DefaultFileSource fileSource(nullptr); - MapData data(MapMode::Continuous, GLContextMode::Unique, view.getPixelRatio()); - util::Thread<MapContext> context({"Map", util::ThreadType::Map, util::ThreadPriority::Regular}, view, fileSource, data); + util::Thread<MapContext> context({"Map", util::ThreadType::Map, util::ThreadPriority::Regular}, + view, fileSource, MapMode::Continuous, GLContextMode::Unique, view.getPixelRatio()); context.invokeSync(&MapContext::setStyleJSON, "", ""); context.invokeSync(&MapContext::setStyleJSON, "", ""); |