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
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
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
Konstantin Käfer
5a59b5f5fc
fix warnings
2014-08-18 14:05:52 +02: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
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
