summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into platform-imageKonstantin Käfer2014-10-313-7/+11
|\
| * use binary mesa on travis to speed up build timesKonstantin Käfer2014-10-311-1/+0
| |
| * allow providing a callback to uv_messenger_stop to prevent mismatched new/freeKonstantin Käfer2014-10-301-1/+2
| |
| * use boost::unicode_iterator on all platform (experimental)artemp2014-10-301-5/+9
| |
* | also allow underscores in token namesKonstantin Käfer2014-10-301-1/+1
| |
* | use CoreImage for decoding/encoding images on osx/iosKonstantin Käfer2014-10-302-3/+3
| |
* | do not crash for missing imagesKonstantin Käfer2014-10-301-1/+1
| |
* | use unique_ptr for automatic deallocationKonstantin Käfer2014-10-301-5/+3
|/
* remove regex/boost regex usageKonstantin Käfer2014-10-301-21/+19
|
* remove unused and unimplemented methodartemp2014-10-301-2/+0
|
* pass Tile::ID by const refartemp2014-10-303-3/+3
|
* merge with mbgl-configDane Springmeyer2014-10-299-62/+49
|\
| * store uv::loop as unique_ptrartemp2014-10-291-2/+1
| |
| * simplify - remove before/afterParse and create Parser on stack in worker threadartemp2014-10-292-8/+0
| |
| * store spriteAtlas by value + make TileParser noncopyableartemp2014-10-292-7/+8
| |
| * store glyphAtlas by value in Map object, pass by refartemp2014-10-295-10/+8
| | | | | | | | change hasData signiture to expect ```StyleLayer const&```
| * Fix variable shadowingJohn Firebaugh2014-10-291-1/+1
| |
| * Replace uv::rwlock with std::recursive_mutexJohn Firebaugh2014-10-291-4/+2
| | | | | | | | Fixes #491
| * Render map with a copy of TransformStateJohn Firebaugh2014-10-293-12/+19
| |
| * Hold internal reference to Sprite in SpriteAtlasJohn Firebaugh2014-10-291-18/+11
| |
| * Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-10-2739-140/+547
| |\
| * | refs #509: tickets good, inline TODO badJustin R. Miller2014-10-271-1/+0
| | |
* | | gyp fixesKonstantin Käfer2014-10-282-40/+40
| |/ |/|
* | make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method ↵artemp2014-10-272-2/+6
| | | | | | | | to minimise number of mutex locking
* | fix build with libuv 0.11Konstantin Käfer2014-10-272-7/+1
| |
* | make tests workKonstantin Käfer2014-10-242-0/+27
| |
* | Merge remote-tracking branch 'origin/headless-display' into gyp-restructuringKonstantin Käfer2014-10-2431-143/+223
|\ \ | | | | | | | | | | | | | | | Conflicts: Makefile ios/mapbox-gl-cocoa
| * | gcc fixesKonstantin Käfer2014-10-233-9/+9
| | |
| * | fix variable shadowingKonstantin Käfer2014-10-2224-96/+97
| | |
| * | replace boost optional with mapbox optionalKonstantin Käfer2014-10-223-19/+77
| | |
| * | Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-10-226-10/+19
| |\ \ | | |/
| * | Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-224-9/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/http_request_baton_curl.cpp include/mbgl/map/map.hpp include/mbgl/util/uv_detail.hpp scripts/travis_before_install.sh setup-libraries.sh src/map/map.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/util/uv-messenger.c
| | * | we don't need a root_fbo function anymoreKonstantin Käfer2014-10-161-6/+0
| | | | | | | | | | | | | | | | [skip ci]
| | * | Merge branch 'master' into libuv-0.10-headless-displayMike Morris2014-10-1051-252/+1011
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/curl_request.cpp common/glfw_view.cpp common/glfw_view.hpp include/mbgl/platform/request.hpp ios/mapbox-gl-cocoa setup-libraries.sh src/map/map.cpp src/platform/request.cpp test/fixtures/fixture_request.cpp
| | * | | don't do concurrent access to a static member variableKonstantin Käfer2014-10-081-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in situations where the renderer is used from multiple threads, this causes memory corruption. fixes mapbox/node-mapbox-gl-native#7
| | * | | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-242-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/headless_view.cpp test/headless.cpp
| | | * \ \ Merge branch 'master' into libuv010Mike Morris2014-09-242-1/+5
| | | |\ \ \
| | * | \ \ \ Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-103-0/+9
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/map/map.cpp
| | | * | | | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the map to be released immediately. Map::terminate() will call any GL functions on the current thread without blocking or defering to the rendering thread. This function allows a GL context to be destroyed and recreated safely without having to delete the Map object. Fixes mapbox/mapbox-gl-native#341 Conflicts: include/llmr/renderer/painter.hpp test/headless.cpp
| | | * | | | Add View::make_inactive() to remove context from rendering threadLeith Bade2014-09-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View::make_inactive() is called just before termination of the rendering thread. The implementation must clear the thread's GL context. This ensures there is no context still bound to a thread during GL shutdown. This is needed as GL will not actually delete a context until it is not active on any thread. Fixes mapbox/mapbox-gl-native#340 Conflicts: common/glfw_view.hpp include/llmr/map/view.hpp test/headless.cpp
| | * | | | | Merge branch 'master' into libuv010Mike Morris2014-09-0923-270/+254
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Merge branch 'master' into libuv010Mike Morris2014-08-298-14/+29
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into libuv010Mike Morris2014-08-277-12/+23
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into libuv010Mike Morris2014-08-2611-59/+56
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: setup-libraries.sh
| | * \ \ \ \ \ \ \ Merge branch 'master' into libuv010Mike Morris2014-08-2512-48/+99
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | bump mapnik-packaging, conform to libuv 0.10 apiMike Morris2014-08-202-5/+5
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into libuv010Mike Morris2014-08-1929-216/+238
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | revert ↵Mike Morris2014-08-131-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mapbox/mapbox-gl-native/commit/992815cc3da3a440dbc56c61925a4e5443b58073
* | | | | | | | | | | | restructure gyp filesKonstantin Käfer2014-10-247-0/+302
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | New mason-based build systemKonstantin Käfer2014-10-225-7/+25
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
View Lorry Controller Status