summaryrefslogtreecommitdiff
path: root/platform
Commit message (Collapse)AuthorAgeFilesLines
* rearrange tests and add storage testsKonstantin Käfer2015-02-042-44/+0
|
* remove circular shared_ptr and a few other memory leaksKonstantin Käfer2015-02-043-47/+73
|
* do not leak string handlesKonstantin Käfer2015-02-041-4/+10
|
* rewrite storage layer to be independent of the Map's event loopKonstantin Käfer2015-02-046-911/+1149
|
* Use std::chronoLeith Bade2015-02-042-5/+5
|
* Remove program binary cachingLeith Bade2015-01-275-90/+0
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-181-1/+8
|\ | | | | | | | | Conflicts: src/mbgl/map/map.cpp
| * Merge pull request #757 from mapbox/move-terminateLeith Bade2015-01-161-0/+3
| |\ | | | | | | Move terminate() call to GLFWView to avoid problems with node
| | * Move terminate() call to GLFWView to avoid problems with nodeLeith Bade2015-01-161-0/+3
| | |
| * | Move class state to mapJohn Firebaugh2015-01-141-1/+5
| |/ | | | | https://github.com/mapbox/mapbox-gl-js/pull/936
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-131-11/+5
|\ \ | |/
| * Merge pull request #748 from mapbox/fix-swapLeith Bade2015-01-131-7/+4
| |\ | | | | | | Correctly handle swapping
| | * Correctly handle swapping. Fixes #666Leith Bade2015-01-121-7/+4
| | |
| * | Correctly call resize with width and height. Fixes #746Leith Bade2015-01-121-4/+1
| |/
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-091-1/+2
|\ \ | |/
| * Merge branch 'master' into shader-performanceJohn Firebaugh2015-01-076-216/+407
| |\
| * | use correct enumKonstantin Käfer2014-12-121-1/+2
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-233-131/+128
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: platform/default/glfw_view.cpp platform/default/headless_view.cpp src/mbgl/map/map.cpp
| * | Rename View functions to match conventions. Also tidy up view classes and ↵Leith Bade2014-12-233-130/+128
| | | | | | | | | | | | remove C style casts. Closes #656
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-212-120/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: Makefile platform/default/headless_view.cpp src/mbgl/map/map.cpp
| * | Use iostream for saving GL program binary. Also check for ↵Leith Bade2014-12-201-6/+10
| | | | | | | | | | | | GL_NUM_PROGRAM_BINARY_FORMATS > 0.
| * | Merge pull request #718 from mapbox/cli-renderJohn Firebaugh2014-12-181-93/+27
| |\ \ | | | | | | | | CLI render
| | * | never create core profile contexts; their API is subtly differentKonstantin Käfer2014-12-161-72/+2
| | | | | | | | | | | | | | | | (e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
| | * | don't assing nullptr to std::stringKonstantin Käfer2014-12-161-21/+25
| | |/
* | | Fix buildLeith Bade2014-12-184-134/+207
| | |
* | | Add run to AssetRequestLeith Bade2014-12-181-5/+19
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-183-0/+256
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gyp/mbgl-ios.gypi gyp/mbgl-osx.gypi platform/default/asset_request_libuv.cpp src/mbgl/storage/caching_http_file_source.cpp src/mbgl/storage/file_request.cpp src/mbgl/storage/file_request.hpp src/mbgl/storage/file_request_baton.hpp
| * | change comment and cache valueKonstantin Käfer2014-12-171-2/+3
| | |
| * | change file:// to asset:// to indicate that they aren't arbitrary filesKonstantin Käfer2014-12-173-27/+72
| | | | | | | | | | | | refs #579
| * | Make file request overridable by platform implementationsKonstantin Käfer2014-12-171-0/+209
| |/ | | | | | | refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-112-32/+40
|\ \ | |/ | | | | | | | | | | | | Conflicts: platform/default/glfw_view.cpp platform/default/headless_view.cpp src/mbgl/renderer/painter.cpp src/mbgl/renderer/prerendered_texture.cpp
| * update error reporting functionKonstantin Käfer2014-12-102-29/+29
| |
| * Use CHECK_ERROR on every GL callLeith Bade2014-12-102-29/+37
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-103-87/+101
|\ \ | |/ | | | | | | | | | | Conflicts: include/mbgl/platform/default/headless_view.hpp platform/default/glfw_view.cpp platform/default/headless_view.cpp
| * fix typoKonstantin Käfer2014-12-091-1/+1
| |
| * Tidy up HeadlessViewLeith Bade2014-12-093-87/+101
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-102-0/+31
|\ \ | |/ | | | | | | Conflicts: platform/default/http_request_baton_curl.cpp
| * report version number in user agent stringKonstantin Käfer2014-12-082-4/+24
| | | | | | | | refs #628
| * add user agent headerKonstantin Käfer2014-12-082-0/+5
| | | | | | | | fixes #628
* | Fix missing shader cache pathLeith Bade2014-12-081-0/+13
| |
* | Add pakced depth stencil to GLFWView and HeadlessViewLeith Bade2014-12-072-0/+9
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-074-0/+102
|\ \ | |/ | | | | | | | | | | Conflicts: include/mbgl/platform/gl.hpp src/mbgl/platform/gl.cpp src/mbgl/shader/shader.cpp
| * Load program binary extension on LinuxLeith Bade2014-12-064-0/+102
| |
* | Fix commitLeith Bade2014-12-062-14/+9
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-053-149/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore gyp/mbgl-ios.gypi gyp/mbgl-linux.gypi gyp/mbgl-osx.gypi include/mbgl/map/map.hpp src/mbgl/map/map.cpp src/mbgl/storage/caching_http_file_source.cpp
| * Change Map::stop to use std::function<void()>John Firebaugh2014-12-041-1/+1
| | | | | | Fixes #685
| * Remove invalid map->terminate()John Firebaugh2014-12-041-1/+0
| | | | | | | | | | Map has already been destroyed by this point, so the call is invalid. The work that terminate() would do has already been done.
| * make most headers privateKonstantin Käfer2014-12-041-115/+0
| |
| * switch to plain file streams rather than JSONKonstantin Käfer2014-12-041-26/+16
| |
| * remove use of std::to_string in favor of boost::lexical_castKonstantin Käfer2014-12-041-2/+0
| | | | | | | | std::to_string calls sprintf() internally, which is really slow
View Lorry Controller Status