summaryrefslogtreecommitdiff
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* [ios] Added Xcode project for iosapp, ios-bench; workspace for ios-testsMinh Nguyễn2016-04-161-0/+6
| | | | | | | | | | ios.xcodeproj is an ordinary Xcode project with ordinary Xcode targets for iosapp and ios-bench, all contained in an ordinary Xcode workspace that happens to also reference the gyp-generated platform.xcodeproj. The iosapp target links to and embeds Mapbox.framework, which is a product of the gyp-generated platform.xcodeproj. ios-tests.xcodeproj is also in the workspace, enabling simultaneous debugging of KIF tests, the SDK, and core code. Moved storyboards into Base.lproj and image assets into an asset catalog. Removed iOS 6 assets from the iosapp asset catalog. Moved the original ios-bench application icon SVG into a non-project location. Removed app/Settings.bundle, which is identical to framework/Settings.bundle. Removed a broken reference to an unused header from the ios-tests project.
* Added scalable iconMinh Nguyễn2016-01-301-0/+81
|
* refs #725: add large source iconJustin R. Miller2014-12-181-0/+0
|
* make tests workKonstantin Käfer2014-10-243-101/+0
|
* Merge remote-tracking branch 'origin/headless-display' into gyp-restructuringKonstantin Käfer2014-10-243-0/+101
|\ | | | | | | | | | | Conflicts: Makefile ios/mapbox-gl-cocoa
| * gcc fixesKonstantin Käfer2014-10-232-7/+7
| |
| * fix variable shadowingKonstantin Käfer2014-10-221-1/+1
| |
| * fixes for libuv 0.11Konstantin Käfer2014-10-221-383/+0
| |
| * Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-229-97/+679
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-5/+0
| | | | | | | | | | | | [skip ci]
| | * we now always use the fboKonstantin Käfer2014-10-161-4/+0
| | | | | | | | | | | | [skip ci]
| | * first attempt to create an opengl core profile version before falling back ↵Konstantin Käfer2014-10-162-19/+82
| | | | | | | | | | | | to legacy opengl contexts
| | * lower our expectations towards the pbuffer and use framebuffers insteadKonstantin Käfer2014-10-153-37/+21
| | |
| | * cast to correct int typeKonstantin Käfer2014-10-151-2/+2
| | |
| | * fix errors that prevented compilation/runningKonstantin Käfer2014-10-153-3/+4
| | |
| | * experimental pbuffer supportKonstantin Käfer2014-10-154-29/+60
| | | | | | | | | | | | [skip ci]
| | * call on_timeout with status 0 (success)Mike Morris2014-10-101-1/+1
| | |
| | * switch http_request_baton_curl to libuv 0.10 apiMike Morris2014-10-101-2/+1
| | |
| | * Merge branch 'master' into libuv-0.10-headless-displayMike Morris2014-10-1013-117/+1330
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | XInitThreadsMike Morris2014-10-091-0/+4
| | | |
| | * | fix HeadlessView::readPixels return value, ref #480Mike Morris2014-10-082-4/+4
| | | |
| | * | add HeadlessView::readPixels, fixes #480Mike Morris2014-10-082-7/+28
| | | |
| | * | throw std::runtime_error instead of fprintf in HeadlessView, closes #481Mike Morris2014-10-081-18/+18
| | | |
| | * | clean up shared_ptr usage in HeadlessViewMike Morris2014-10-072-8/+8
| | | |
| | * | clean up shared_ptr usageMike Morris2014-10-062-8/+8
| | | |
| | * | use shared_ptr for HeadlessDisplay in HeadlessViewMike Morris2014-10-062-8/+10
| | | |
| | * | wrap GL/glx.h with undef None, use 0 instead, h/t @jfirebaughMike Morris2014-10-064-3/+5
| | | |
| | * | forward declare HeadlessDisplay in headless_view.hppMike Morris2014-10-064-10/+12
| | | |
| | * | break out HeadlessDisplay from HeadlessView, ref #478Mike Morris2014-10-034-60/+121
| | | |
| | * | log CGLErrorString for CGLChoosePixelFormat, enable OpenGLMike Morris2014-09-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | multithreading https://developer.apple.com/library/mac/technotes/tn2085/_index.html
| | * | make view active/inactive around Map::setup, don't leave active after ↵Mike Morris2014-09-301-2/+2
| | | | | | | | | | | | | | | | view.resize()
| | * | add more possible errors returned by glCheckFramebufferStatusEXTMike Morris2014-09-291-0/+3
| | | | | | | | | | | | | | | | from https://www.opengl.org/registry/specs/EXT/framebuffer_object.txt
| | * | make inactive at end of clear_buffers()Mike Morris2014-09-251-1/+3
| | | |
| | * | make active after resizeMike Morris2014-09-241-0/+2
| | | |
| | * | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-241-11/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: common/headless_view.cpp
| | | * | Revert "add debugging"Mike Morris2014-09-241-9/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 0cdaf58027b758650f4bb7ca7a006cb8568c080c.
| | * | | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-242-2/+16
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: common/headless_view.cpp test/headless.cpp
| | | * | Merge branch 'master' into libuv010Mike Morris2014-09-242-2/+5
| | | |\ \
| | | * | | move make_active call into MBGL_USE_CGL blockMike Morris2014-09-241-1/+1
| | | | | |
| | | * | | add debuggingMike Morris2014-09-241-0/+9
| | | | | |
| | * | | | bump mapnik-packaging, remove unnecessary view.make_active callsMike Morris2014-09-191-3/+2
| | | | | |
| | * | | | make_active only for CGL in clear_buffersMike Morris2014-09-161-0/+2
| | | | | |
| | * | | | dont make_active when clearing buffers, call make_inactive at end of ↵Mike Morris2014-09-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Map::prepare()
| | * | | | pass NULL instead of nullptr to glXMakdeCurrentMike Morris2014-09-111-1/+1
| | | | | |
| | * | | | clear_buffers in make_inactive, call make_inactive in destructorMike Morris2014-09-111-0/+4
| | | | | |
| | * | | | drop clear_buffers and glx make_inactive from descrtuctorMike Morris2014-09-111-3/+0
| | | | | |
| | * | | | add GLX support to HeadlessView::make_inactiveMike Morris2014-09-101-1/+3
| | | | | |
| | * | | | Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-104-1/+23
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: src/map/map.cpp
| | | * | | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-104-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status