summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make active after resizeMike Morris2014-09-241-0/+2
|
* Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-242-12/+2
|\ | | | | | | | | Conflicts: common/headless_view.cpp
| * remove travis conditional in darwin_configure.shMike Morris2014-09-241-1/+1
| |
| * build iPhoneSimulator64 against libuv 0.10.28Mike Morris2014-09-241-0/+1
| |
| * fix ios builds?Mike Morris2014-09-241-1/+1
| |
| * Revert "add debugging"Mike Morris2014-09-241-9/+0
| | | | | | | | This reverts commit 0cdaf58027b758650f4bb7ca7a006cb8568c080c.
| * update MP_HASHMike Morris2014-09-241-1/+1
| |
* | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-248-173/+190
|\ \ | |/ | | | | | | | | Conflicts: common/headless_view.cpp test/headless.cpp
| * Merge branch 'master' into libuv010Mike Morris2014-09-248-173/+178
| |\
| | * transition-* ⇢ *-transitionJohn Firebaugh2014-09-221-31/+31
| | | | | | | | | | | | https://github.com/mapbox/mapbox-gl-style-spec/issues/148
| | * Support pixelRatio parameter for render testsJohn Firebaugh2014-09-223-7/+15
| | |
| | * Refactor tile cover to match JSJohn Firebaugh2014-09-224-135/+132
| | |
| * | move make_active call into MBGL_USE_CGL blockMike Morris2014-09-241-1/+1
| | |
| * | add debuggingMike Morris2014-09-241-0/+9
| | |
* | | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-226-33/+55
|\ \ \ | |/ / | | | | | | | | | Conflicts: setup-libraries.sh
| * | bump mapnik-packagingMike Morris2014-09-221-1/+1
| | |
| * | Merge branch 'master' into libuv010Mike Morris2014-09-226-32/+54
| |\ \ | | |/ | | | | | | | | | Conflicts: setup-libraries.sh
| | * bump Cocoa one more timeJustin R. Miller2014-09-181-0/+0
| | |
| | * bump Cocoa for location fixesJustin R. Miller2014-09-181-0/+0
| | |
| | * bump CocoaJustin R. Miller2014-09-171-0/+0
| | |
| | * fix 64-bit iOS buildsJustin R. Miller2014-09-175-22/+37
| | |
| | * Update Ubuntu instructions in README [skip ci]AJ Ashton2014-09-171-2/+2
| | |
| | * Add gcc back to build matrix (fixes #465)John Firebaugh2014-09-151-9/+16
| | |
* | | bump mapnik-packaging, remove unnecessary view.make_active callsMike Morris2014-09-194-13/+9
| | |
* | | 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-162-5/+2
| | | | | | | | | | | | 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
| | |
* | | don't terminate after Map::runMike Morris2014-09-101-2/+0
| | |
* | | fix Map::terminate?Mike Morris2014-09-101-1/+2
| | |
* | | update Painter::deleteShadersMike Morris2014-09-101-2/+3
| | |
* | | Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-109-1/+58
|\ \ \ | |/ / |/| | | | | | | | Conflicts: src/map/map.cpp
| * | Move notify_map_change() from a global callback, to a callback inLeith Bade2014-09-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View. This allows for their to me more than one Map object alive at a time. Fixes mapbox/mapbox-gl-native#346 Conflicts: common/glfw_view.hpp include/llmr/map/view.hpp include/mbgl/map/transform.hpp src/map/map.cpp src/map/transform.cpp test/headless.cpp
| * | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-105-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-106-0/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Revert "make context active before clearing buffers"Mike Morris2014-09-101-2/+0
| | | | | | | | This reverts commit 636fedff122dc254ec77ea5504cf8d94acd8b351.
| * make context active before clearing buffersMike Morris2014-09-101-0/+2
| |
* | make context active before clearing buffersMike Morris2014-09-101-0/+2
| |
* | bump MP_HASHMike Morris2014-09-091-1/+1
| |
* | Merge branch 'master' into libuv010Mike Morris2014-09-0972-1254/+951
|\ \ | |/
| * Fix build on gcc (fixes #464)John Firebaugh2014-09-081-1/+3
| |
| * SDF icon support (fixes #404)John Firebaugh2014-09-0810-173/+265
| |
| * Don't overrotate line labels (fixes #462)John Firebaugh2014-09-081-4/+0
| |
| * FrameHistory::getFadePropertiesJohn Firebaugh2014-09-053-37/+51
| |
| * Match js attribute layoutJohn Firebaugh2014-09-052-17/+18
| |
| * Match js shadersJohn Firebaugh2014-09-0514-44/+68
| | | | | | | | | | | | 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
| * Implement text-rotation-alignmentJohn Firebaugh2014-09-041-0/+10
| |
| * TextShader ⇢ SDFShaderJohn Firebaugh2014-09-049-40/+40
| |
View Lorry Controller Status