summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| |
| * notifications on request cancellationKonstantin Käfer2014-09-243-6/+26
| |
| * use separate workers for tile parsing to avoid blocking the threadpool for ↵Konstantin Käfer2014-09-244-14/+29
| | | | | | | | other libuv actions
| * use util::ptr as a wrapper around std::shared_ptr that asserts nonemptinessKonstantin Käfer2014-09-2432-126/+151
| |
| * make sure all of our async handles are stopped before stopping the map threadKonstantin Käfer2014-09-244-18/+14
| |
| * do 304 requests and cache them in sqliteKonstantin Käfer2014-09-2423-144/+642
| |
| * parse cache-control and last-modified headersKonstantin Käfer2014-09-242-9/+31
| |
| * compress data and store typeKonstantin Käfer2014-09-242-7/+22
| |
| * add basic request caching with sqliteKonstantin Käfer2014-09-242-1/+16
| |
* | 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
| |\ \ | | |/
| | * Refactor tile cover to match JSJohn Firebaugh2014-09-222-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
|\ \ | |/
| * SDF icon support (fixes #404)John Firebaugh2014-09-084-6/+33
| |
| * FrameHistory::getFadePropertiesJohn Firebaugh2014-09-051-0/+8
| |
| * Match js shadersJohn Firebaugh2014-09-052-3/+8
| | | | | | | | | | | | The only non-incidental change is to revert portions of d5b4c116 and 3a9a9043. See https://github.com/mapbox/mapbox-gl-native/commit/d5b4c1162dab706d6f56881e3f72baa003ad8ac7#commitcomment-7668050
| * TextShader ⇢ SDFShaderJohn Firebaugh2014-09-043-8/+8
| |
| * Less shader boilerplateJohn Firebaugh2014-09-0414-268/+147
| |
| * Fix text/icon-translate-anchorJohn Firebaugh2014-09-042-3/+1
| | | | | | These are style properties, not render properties.
| * Add SpriteAtlas::getPosition()John Firebaugh2014-09-031-0/+9
| |
| * Make renderLine more similar to JSJohn Firebaugh2014-09-031-7/+6
| |
| * linepattern in progressLauren Budorick2014-09-033-1/+64
| |
| * Revert "coalesce texture uploads at the beginning of a frame"John Firebaugh2014-09-032-5/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 8c2c7f769fffcd217698824719b0a0ba45fbef13. See #454 Conflicts: src/geometry/glyph_atlas.cpp src/geometry/sprite_atlas.cpp
| * Revert "Avoid zero size array warning"John Firebaugh2014-09-031-1/+0
| | | | | | | | This reverts commit d4fd57aae976f36a4f235e1e8358f6c5c1ad6d98.
* | Merge branch 'master' into libuv010Mike Morris2014-08-298-14/+29
|\ \ | |/
| * Fix text-line-heightJohn Firebaugh2014-08-281-3/+3
| |
| * SimplifyJohn Firebaugh2014-08-281-1/+0
| |
| * Remove vtxMatrix stateJohn Firebaugh2014-08-281-2/+1
| |
| * Fix default text-sizeJohn Firebaugh2014-08-281-1/+1
| |
View Lorry Controller Status