tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,820 Commits 3 Branches 22 Tags
c458f246fa965407dd4cde44444f6017eac20171
Commit Graph

127 Commits

Author SHA1 Message Date
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display 
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
 2014-10-10 12:24:45 -04:00
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
7aea160760 throw std::runtime_error instead of fprintf in HeadlessView, closes #481 2014-10-08 14:47:41 -04:00
Konstantin Käfer
f807926f5e report a permanent error instead of aborting on unknown error codes 
fixes #479
 2014-10-08 16:05:27 +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
Konstantin Käfer
8fcc74e253 fix headless tests 2014-09-30 17:29:10 +02:00
Konstantin Käfer
5d34c18c80 disable URLcache for NSURLRequests 2014-09-30 17:29:09 +02: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
Konstantin Käfer
5c6863c540 add missing include 2014-09-29 08:10:31 -07:00
Konstantin Käfer
9e44c0eae8 add reachability 2014-09-29 14:02:42 +02:00
Konstantin Käfer
b9628c8654 add etag support and if-none-match/if-modified-since to cocoa http handling 2014-09-26 16:10:39 +02:00
Mike Morris
8e6967669a make inactive at end of clear_buffers() 2014-09-25 18:06:55 -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
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
Konstantin Käfer
1209744b38 use the default cache location on ios to avoid writing to unwritable file system locations 2014-09-24 17:08:44 +02:00
Konstantin Käfer
992d9ff051 add back CURL requesting 2014-09-24 16:19:47 +02:00
Konstantin Käfer
0fc1f66868 whitespace fixes 2014-09-24 16:16:30 +02:00
Konstantin Käfer
ec3183754e move cocoa nsurlrequest code to common folder 2014-09-24 16:16:30 +02:00
Konstantin Käfer
111fccb76c option to pass data parameter, and add more explanation 2014-09-24 16:14:10 +02:00
Konstantin Käfer
ba18c08524 add a callback to stop() to allow running the current thread's event loop 2014-09-24 16:14:10 +02:00
Konstantin Käfer
d9fc7708a2 do 304 requests and cache them in sqlite 2014-09-24 16:14:09 +02:00
Konstantin Käfer
b94635f704 parse cache-control and last-modified headers 2014-09-24 16:12:03 +02: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