summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fix compile warningsKonstantin Käfer2014-10-222-3/+5
| | | | | | | | | | |
| * | | | | | | | | | link boost when the boost variable is setKonstantin Käfer2014-10-222-2/+2
| | | | | | | | | | |
| * | | | | | | | | | first attempt at using mason to install packagesKonstantin Käfer2014-10-202-4/+23
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | | Fix log message filteringJohn Firebaugh2014-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taking the sizeof a pointer doesn't give you the array length!
* | | | | | | | | | Fix compiler warningsJohn Firebaugh2014-10-171-2/+4
| | | | | | | | | |
* | | | | | | | | | background-image supportJohn Firebaugh2014-10-174-2/+12
|/ / / / / / / / /
* | | | | | | | | fix gcc cannot call member function without object errorKonstantin Käfer2014-10-011-2/+2
| | | | | | | | |
* | | | | | | | | properly ref/unref the handle and run the loop again for shutdown purposesKonstantin Käfer2014-10-013-2/+3
| | | | | | | | |
* | | | | | | | | fix headless testsKonstantin Käfer2014-09-302-1/+3
| | | | | | | | |
* | | | | | | | | move file request baton to its own fileKonstantin Käfer2014-09-301-0/+35
| | | | | | | | |
* | | | | | | | | add reachabilityKonstantin Käfer2014-09-294-0/+10
| | | | | | | | |
* | | | | | | | | add retries in case of connection failuresKonstantin Käfer2014-09-291-0/+2
| | | | | | | | |
* | | | | | | | | don't pass the loop through all function callsKonstantin Käfer2014-09-291-3/+5
| | | | | | | | |
* | | | | | | | | add etag support and if-none-match/if-modified-since to cocoa http handlingKonstantin Käfer2014-09-262-1/+2
| | | | | | | | |
* | | | | | | | | use the default cache location on ios to avoid writing to unwritable file ↵Konstantin Käfer2014-09-242-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system locations
* | | | | | | | | add back CURL requestingKonstantin Käfer2014-09-242-29/+23
| | | | | | | | |
* | | | | | | | | whitespace fixesKonstantin Käfer2014-09-241-1/+0
| | | | | | | | |
* | | | | | | | | add retry timersKonstantin Käfer2014-09-246-2/+86
| | | | | | | | |
* | | | | | | | | use asynchronous worker terminationKonstantin Käfer2014-09-242-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of waiting until all threads have joined, we are now supplying a callback that will be invoked once all threads have terminated. you can use this callback to free the worker struct
* | | | | | | | | make SourceInfo object noncopyable and use a shared_pointer for itKonstantin Käfer2014-09-245-9/+10
| | | | | | | | |
* | | | | | | | | option to pass data parameter, and add more explanationKonstantin Käfer2014-09-241-4/+9
| | | | | | | | |
* | | | | | | | | add a callback to stop() to allow running the current thread's event loopKonstantin Käfer2014-09-242-1/+8
| | | | | | | | |
View Lorry Controller Status