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
John Firebaugh
9d5f02ccaa
Match js shaders
...
The only non-incidental change is to revert portions
of d5b4c1163a9a9043d5b4c1162d (commitcomment-7668050)
2014-09-05 13:23:14 -07:00
John Firebaugh
7b9ad022a9
Implement text-rotation-alignment
2014-09-04 18:12:40 -07:00
John Firebaugh
f2391e25ea
TextShader ⇢ SDFShader
2014-09-04 17:59:22 -07:00
John Firebaugh
1fedf0918a
Less shader boilerplate
2014-09-04 16:22:25 -07:00
John Firebaugh
c14ae3c477
Fix text/icon-translate-anchor
...
These are style properties, not render properties.
2014-09-04 15:38:14 -07:00
John Firebaugh
4694aa40ad
Add SpriteAtlas::getPosition()
2014-09-03 18:12:40 -07:00
John Firebaugh
586cb9144a
Make renderLine more similar to JS
2014-09-03 18:12:40 -07:00
Lauren Budorick
71c31cee24
linepattern in progress
2014-09-03 18:12:40 -07:00
John Firebaugh
c1280f0b38
Revert "coalesce texture uploads at the beginning of a frame"
...
This reverts commit 8c2c7f769f#454
Conflicts:
src/geometry/glyph_atlas.cpp
src/geometry/sprite_atlas.cpp
2014-09-03 18:12:39 -07:00
John Firebaugh
bb9a466adb
Revert "Avoid zero size array warning"
...
This reverts commit d4fd57aae9
2014-09-03 17:04:38 -07:00
Mike Morris
74c4f976d1
fix ios builds?
2014-09-03 19:05:07 -04:00
John Firebaugh
a634605176
Kill config.mk ( fixes #456 )
2014-09-03 14:59:18 -07:00
John Firebaugh
3eb05efde2
Also release the current context
2014-09-03 14:50:03 -07:00
Mike Morris
88ef2f23e5
cache linux deps builds on MP_HASH, DIR_HASH
2014-09-03 17:20:48 -04:00
John Firebaugh
01d9d43f01
glXDestroyContext, XFree, XCloseDisplay
2014-09-03 14:13:41 -07:00
Mike Morris
6e5308a61b
uv_async_init &complete
2014-09-03 15:13:59 -04:00
Mike Morris
17b1e13f34
Merge branch 'master' into libuv010
2014-09-02 17:57:43 -04:00
Mike Morris
6b23d05a23
remove debugging
2014-09-02 17:48:34 -04:00
Mike Morris
b18cf767c0
use std::fopen/std::fread instead of libuv, thanks @springmeyer
2014-09-02 17:30:35 -04:00
Justin R. Miller
5cf1afa3d0
capitalization
2014-09-02 13:33:50 -07:00
Mike Morris
a8021e84f8
Merge branch 'master' into libuv010
2014-08-29 15:43:13 -04:00
John Firebaugh
eb1fbc542b
Fix text-justify ( fixes #444 )
2014-08-29 12:25:17 -07:00
John Firebaugh
2e8fb5f667
Fix text-line-height
2014-08-28 18:44:11 -07:00
John Firebaugh
9d6c7685d0
Implement {text,icon}-translate[-anchor]
2014-08-28 17:24:29 -07:00
John Firebaugh
e71a1a9077
Simplify
2014-08-28 17:16:37 -07:00
