Mike Morris
4056259408
implement make_inactive in mapbox-gl-cocoa
2014-09-25 12:17:26 -04:00
Mike Morris
67a86d9f28
Merge branch 'libuv-0.10-fix-context-shutdown' of github.com:mapbox/mapbox-gl-native into libuv-0.10-fix-context-shutdown
2014-09-25 12:05:43 -04:00
Mike Morris
dffeaa0787
make active after resize
2014-09-24 23:03:50 -04:00
Mike Morris
11f9081274
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
...
Conflicts:
common/headless_view.cpp
2014-09-24 22:40:07 -04:00
Mike Morris
92d00347a8
remove travis conditional in darwin_configure.sh
2014-09-24 18:51:52 -04:00
Mike Morris
768e23069c
build iPhoneSimulator64 against libuv 0.10.28
2014-09-24 17:11:18 -04:00
Mike Morris
735d245697
fix ios builds?
2014-09-24 16:40:10 -04:00
Mike Morris
86b7367994
Revert "add debugging"
...
This reverts commit 0cdaf58027
2014-09-24 16:30:01 -04:00
Mike Morris
c9a9f23c30
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
2014-09-24 16:10:47 -04:00
Mike Morris
47c6bb5bd4
update MP_HASH
2014-09-24 16:10:36 -04:00
Mike Morris
3dec4933a9
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
...
Conflicts:
common/headless_view.cpp
test/headless.cpp
2014-09-24 15:58:52 -04:00
Mike Morris
8a19896c3a
Merge branch 'master' into libuv010
2014-09-24 15:40:08 -04:00
Mike Morris
c5a7738dd6
move make_active call into MBGL_USE_CGL block
2014-09-24 15:17:42 -04:00
Mike Morris
0cdaf58027
add debugging
2014-09-24 14:40:49 -04:00
Mike Morris
9b6cff4301
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
...
Conflicts:
setup-libraries.sh
2014-09-22 18:07:46 -04:00
Mike Morris
8e1bbae81f
bump mapnik-packaging
2014-09-22 18:06:24 -04:00
John Firebaugh
ee3e0827a2
transition-* ⇢ *-transition
...
https://github.com/mapbox/mapbox-gl-style-spec/issues/148
2014-09-22 14:32:30 -07:00
Mike Morris
96736d83df
Merge branch 'master' into libuv010
...
Conflicts:
setup-libraries.sh
2014-09-22 17:26:14 -04:00
John Firebaugh
4b98870e99
Support pixelRatio parameter for render tests
2014-09-22 14:05:15 -07:00
John Firebaugh
896379daa5
Refactor tile cover to match JS
2014-09-22 13:39:43 -07:00
Mike Morris
65df83ce4c
bump mapnik-packaging, remove unnecessary view.make_active calls
2014-09-19 16:16:44 -04:00
Justin R. Miller
0039479d6e
bump Cocoa one more time
2014-09-18 10:29:25 -07:00
Justin R. Miller
eb1f1a7052
bump Cocoa for location fixes
2014-09-18 09:57:33 -07:00
Justin R. Miller
647335c218
bump Cocoa
2014-09-17 18:51:55 -07:00
Justin R. Miller
5788714e3b
fix 64-bit iOS builds
2014-09-17 18:26:33 -07:00
AJ Ashton
65185ca377
Update Ubuntu instructions in README [skip ci]
2014-09-17 14:10:40 -07:00
Mike Morris
d48e5e7221
make_active only for CGL in clear_buffers
2014-09-16 18:06:24 -04:00
Mike Morris
9d369ec742
dont make_active when clearing buffers, call make_inactive at end of Map::prepare()
2014-09-16 18:00:52 -04:00
John Firebaugh
e26020ccac
Add gcc back to build matrix ( fixes #465 )
2014-09-15 11:34:12 -07:00
Mike Morris
70aaf8d343
pass NULL instead of nullptr to glXMakdeCurrent
2014-09-11 10:09:30 -04:00
Mike Morris
1f7c591bc4
clear_buffers in make_inactive, call make_inactive in destructor
2014-09-11 09:59:08 -04:00
Mike Morris
f93a230e97
drop clear_buffers and glx make_inactive from descrtuctor
2014-09-11 09:48:12 -04:00
Mike Morris
d9ccc501c3
add GLX support to HeadlessView::make_inactive
2014-09-10 19:42:06 -04:00
Mike Morris
57fb4b984d
don't terminate after Map::run
2014-09-10 19:23:40 -04:00
Mike Morris
c03beb070b
fix Map::terminate?
2014-09-10 19:15:03 -04:00
Mike Morris
89f54e8789
update Painter::deleteShaders
2014-09-10 19:00:28 -04:00
Mike Morris
15564b81a3
Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown
...
Conflicts:
src/map/map.cpp
2014-09-10 18:53:20 -04:00
Leith Bade
7a4c914d05
Move notify_map_change() from a global callback, to a callback in
...
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
2014-09-10 18:47:13 -04:00
Leith Bade
71549e7b93
Adds the function Map::terminate() to allow all GL resources held
...
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
2014-09-10 18:31:20 -04:00
Leith Bade
c004c03696
Add View::make_inactive() to remove context from rendering thread
...
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
2014-09-10 18:21:03 -04:00
Mike Morris
c836bc2b01
Revert "make context active before clearing buffers"
...
This reverts commit 636fedff12
2014-09-10 15:11:17 -04:00
Mike Morris
636fedff12
make context active before clearing buffers
2014-09-10 14:53:31 -04:00
Mike Morris
4316d2c405
make context active before clearing buffers
2014-09-10 14:24:29 -04:00
Mike Morris
2e2c7befac
bump MP_HASH
2014-09-09 17:09:03 -04:00
Mike Morris
c32bb85248
Merge branch 'master' into libuv010
2014-09-09 17:06:22 -04:00
John Firebaugh
2a50fccd24
Fix build on gcc ( fixes #464 )
2014-09-08 22:26:10 -07:00
John Firebaugh
eb4f53cbed
SDF icon support ( fixes #404 )
2014-09-08 15:12:32 -07:00
John Firebaugh
2033eb9494
Don't overrotate line labels ( fixes #462 )
2014-09-08 11:22:54 -07:00
John Firebaugh
de720f3515
FrameHistory::getFadeProperties
2014-09-05 14:03:33 -07:00
John Firebaugh
4c0b4a7901
Match js attribute layout
2014-09-05 13:40:45 -07:00
