Commit Graph

1772 Commits

Author SHA1 Message Date
Mike Morris
356cf956f4 XInitThreads 2014-10-09 15:16:01 -04:00
Mike Morris
dfb81fe9ce fix HeadlessView::readPixels return value, ref #480 2014-10-08 16:04:19 -04:00
Mike Morris
a1bc8c766d add HeadlessView::readPixels, fixes #480 2014-10-08 15:31:41 -04:00
Mike Morris
799ca683df Merge branch 'libuv-0.10-headless-display' of github.com:mapbox/mapbox-gl-native into libuv-0.10-headless-display 2014-10-08 14:47:48 -04:00
Mike Morris
7aea160760 throw std::runtime_error instead of fprintf in HeadlessView, closes #481 2014-10-08 14:47:41 -04:00
Konstantin Käfer
91f40daa69 don't do concurrent access to a static member variable
in situations where the renderer is used from multiple threads, this causes memory corruption.

fixes mapbox/node-mapbox-gl-native#7
2014-10-08 15:27:33 +02:00
Mike Morris
36b7bb0c09 clean up shared_ptr usage in HeadlessView 2014-10-07 16:26:21 -04:00
Mike Morris
5cc6b26229 clean up shared_ptr usage 2014-10-06 18:24:01 -04:00
Mike Morris
41dac96408 use shared_ptr for HeadlessDisplay in HeadlessView 2014-10-06 18:05:10 -04:00
Mike Morris
8b06b65f35 wrap GL/glx.h with undef None, use 0 instead, h/t @jfirebaugh 2014-10-06 16:53:57 -04:00
Mike Morris
170ce422ce forward declare HeadlessDisplay in headless_view.hpp 2014-10-06 15:45:14 -04:00
Mike Morris
0f1d33f5ee break out HeadlessDisplay from HeadlessView, ref #478 2014-10-03 18:31:38 -04:00
Mike Morris
c4c4b3318a log CGLErrorString for CGLChoosePixelFormat, enable OpenGL
multithreading

https://developer.apple.com/library/mac/technotes/tn2085/_index.html
2014-09-30 17:42:27 -04:00
Mike Morris
848dccbcae make view active/inactive around Map::setup, don't leave active after view.resize() 2014-09-30 12:06:51 -04:00
Mike Morris
8ebe1bc360 add more possible errors returned by glCheckFramebufferStatusEXT
from https://www.opengl.org/registry/specs/EXT/framebuffer_object.txt
2014-09-29 16:33:26 -04:00
Mike Morris
8e6967669a make inactive at end of clear_buffers() 2014-09-25 18:06:55 -04:00
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