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
86b7367994
Revert "add debugging"
...
This reverts commit 0cdaf58027
2014-09-24 16:30:01 -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
John Firebaugh
4b98870e99
Support pixelRatio parameter for render tests
2014-09-22 14:05:15 -07:00
Mike Morris
65df83ce4c
bump mapnik-packaging, remove unnecessary view.make_active calls
2014-09-19 16:16:44 -04: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
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
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
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
c32bb85248
Merge branch 'master' into libuv010
2014-09-09 17:06:22 -04:00
John Firebaugh
3eb05efde2
Also release the current context
2014-09-03 14:50:03 -07:00
John Firebaugh
01d9d43f01
glXDestroyContext, XFree, XCloseDisplay
2014-09-03 14:13:41 -07:00
Mike Morris
2233f981fb
port curl_request to libuv 0.10.x
2014-08-26 17:09:32 -04:00
Konstantin Käfer
5b4ad90bac
Merge pull request #445 from mapbox/nsstring
...
Use NSString-specific case change functions on OS X/iOS
2014-08-26 17:43:02 +02:00
John Firebaugh
67b315c503
Indicate gzip support as well as deflate
...
libcurl supports both: http://curl.haxx.se/dev/readme-encoding.html
2014-08-22 10:24:32 -07:00
Konstantin Käfer
6610a6370b
use platform-specific NSString for case changes on OS X/iOS
...
refs #309
2014-08-22 12:37:23 +02:00
Konstantin Käfer
5a59b5f5fc
fix warnings
2014-08-18 14:05:52 +02:00
Konstantin Käfer
919947e6c7
remove uv.h dependency in darwin-specific code
2014-08-12 11:54:11 +02:00
Konstantin Käfer
6f80264291
remove uv.h dependency from header files
2014-08-12 11:45:30 +02:00
John Firebaugh
70a31baf5c
Eliminate warnings
2014-08-07 13:02:40 -07:00
Konstantin Käfer
05b95ab057
show zom/lat/lon/bearing in window title
2014-08-05 15:28:46 +02:00
John Firebaugh
86336ed838
Flip name and units and sign of rotation API
...
Angle -> Bearing
Radians -> Degrees
Clockwise -> Counterclockwise
2014-07-21 11:30:51 -07:00
Konstantin Käfer
fa4133a094
add missing header
2014-07-16 19:01:35 -07:00
Konstantin Käfer
4ea281c750
rename llmr => mbgl
2014-07-16 18:53:56 -07:00
Konstantin Käfer
c1a64dc5fa
rename file and fix merge error
2014-07-16 18:30:04 -07:00
Justin R. Miller
a902446e7f
refs #342 & #346 : per-map change callbacks
2014-07-16 18:18:04 -07:00
Justin R. Miller
1f06f518b2
allow for delayed map notifications during animations
2014-07-15 18:48:01 -07:00
Konstantin Käfer
ba7d8c7731
fix errors
2014-07-14 16:38:34 -07:00
Konstantin Käfer
bdc97d55d2
add enum class to unify parsing/stringification
2014-07-14 16:33:02 -07:00
Konstantin Käfer
30298be270
add cstdarg headers
2014-07-11 16:42:09 -07:00
Konstantin Käfer
fbec72cd47
allow formatted messages
2014-07-11 16:25:20 -07:00
Konstantin Käfer
7ffe4a7858
add nslog and stderr log backends
2014-07-11 14:34:17 -07:00
Konstantin Käfer
df65ecaa34
fix compile errors
2014-07-08 14:53:17 -07:00
Konstantin Käfer
501af4a380
fix headless rendering on travis and actually execute the headless test
...
fixes #357
2014-07-07 16:52:23 -07:00
Konstantin Käfer
f51bd7fcf1
first draft at glx headless rendering
...
[skip ci]
2014-07-07 14:49:23 -07:00
Konstantin Käfer
9b61e39ef3
move headless to their own files
...
[skip ci]
2014-07-07 13:51:06 -07:00
Konstantin Käfer
853c9a5876
add ca bundle to linux build
2014-07-07 10:18:32 -07:00
Justin R. Miller
9e9623d2ec
fix up OS X/headless notify_map_change() for new API
2014-07-03 19:08:26 -07:00
