Commit Graph

5798 Commits

Author SHA1 Message Date
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05:00
Konstantin Käfer
57e6bc6e1b fix error in non-debug builds 2014-12-15 14:16:30 +01:00
Konstantin Käfer
21e9e0a5ea set rendering mode so that we can skip intermediate renders for static images 2014-12-12 15:01:09 +01:00
Konstantin Käfer
abf702046b use correct enum 2014-12-12 12:37:55 +01:00
Konstantin Käfer
6cabaf0230 provide explicit constructor to appease GCC 2014-12-12 12:37:55 +01:00
Konstantin Käfer
bec97a3d40 warp in MBGL_CHECK_ERROR() call 2014-12-12 12:37:55 +01:00
Konstantin Käfer
febfb7ac09 fix rendering errors 2014-12-12 12:37:55 +01:00
Konstantin Käfer
f8ba23377d [performance] remove glFlush() 2014-12-12 12:37:55 +01:00
Konstantin Käfer
2648e6a964 add debug line for showing the sprite atlas 2014-12-12 12:37:55 +01:00
Konstantin Käfer
06735c6544 depend on mbgl-core instead of -standalone so we don't have to run the packaging script every time
(this speeds up the build slightly)
2014-12-12 12:37:55 +01:00
Konstantin Käfer
5b14c85b78 use 4-byte aligned vertex attributes for performance reason
reverts 9d5f02ccaa and 4c0b4a7901
2014-12-12 12:37:54 +01:00
Leith Bade
6f56e88ee5 Stop services only on Linux 2014-12-12 10:36:54 +11:00
Leith Bade
3c021085a1 jq is now installed by default 2014-12-12 10:25:18 +11:00
Leith Bade
30c80af0d2 Fix bash error 2014-12-12 09:59:27 +11:00
Leith Bade
80016cd469 Don't need X for android builds 2014-12-12 09:49:06 +11:00
Mike Morris
76909d18fb log headless test fixture names 2014-12-11 16:37:48 -05:00
Konstantin Käfer
1fe545aee4 fix crashes when running in non-continuous mode 2014-12-11 18:32:25 +01:00
Konstantin Käfer
a4ce5152e8 don't provide a default value for the stylesheet file 2014-12-11 18:32:09 +01:00
Konstantin Käfer
343fd4bcac allow setting the cache database 2014-12-11 18:31:56 +01:00
Konstantin Käfer
41d9e7730f add xcode project for render cli util 2014-12-11 18:31:32 +01:00
Konstantin Käfer
8b5bba08b3 show default values and allow setting the output filename 2014-12-11 18:02:24 +01:00
Konstantin Käfer
a81e822ef0 add cli tool for rendering a map to an image 2014-12-11 17:58:36 +01:00
John Firebaugh
8f380af381 More explict Android OSX instructions 2014-12-10 14:16:51 -08:00
Leith Bade
87ef90b896 Use libnu 1.5.1 2014-12-11 07:24:20 +11:00
Leith Bade
911da56ea6 Fix service name 2014-12-11 00:19:34 +11:00
Leith Bade
df2ebadaa3 Add missing CHECK_ERROR 2014-12-11 00:14:46 +11:00
Leith Bade
d599fc5504 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/prerendered_texture.cpp
2014-12-11 00:09:26 +11:00
Konstantin Käfer
0c62cd0655 Merge pull request #711 from mapbox/check-gl-error
Use CHECK_ERROR on every GL call
2014-12-10 13:55:39 +01:00
Konstantin Käfer
4ad28c931a only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them 2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
127600ef8c Fix unused param 2014-12-10 22:23:53 +11:00
Leith Bade
08b07c30a7 Reduce GL log spew 2014-12-10 22:15:41 +11:00
Leith Bade
0808485453 Use CHECK_ERROR on every GL call 2014-12-10 21:57:34 +11:00
Leith Bade
6bb1a5a146 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
2014-12-10 19:22:25 +11:00
Leith Bade
c38bd5e403 Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-10 19:14:12 +11:00
Leith Bade
2db8134d20 Add Android user-agent info 2014-12-10 19:14:05 +11:00
Leith Bade
69cd7268d7 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	platform/default/http_request_baton_curl.cpp
2014-12-10 19:13:21 +11:00
Leith Bade
e6c8365767 Stop DB services 2014-12-10 09:46:28 +11:00
Mike Morris
392150dd48 Merge pull request #707 from mapbox/start-group
wrap mbgl-core and mbgl-linux in -Wl,--start-group/-Wl,--end-group
2014-12-09 12:11:12 -05:00
Mike Morris
538120bb7f wrap mbgl-core and mbgl-linux in -Wl,--start-group/-Wl,--end-group 2014-12-09 12:09:22 -05:00
Konstantin Käfer
bb0e57b838 Merge pull request #708 from mapbox/headless-tidy
Tidy up HeadlessView
2014-12-09 15:08:21 +01:00
Konstantin Käfer
5ccc988ff7 fix typo 2014-12-09 14:55:32 +01:00
Konstantin Käfer
90ac844d7e Merge pull request #709 from mapbox/version-header-only
Include version symbols only in mbgl-core library
2014-12-09 14:54:17 +01:00
Konstantin Käfer
753b6eedd6 also install the version header 2014-12-09 14:35:27 +01:00
Konstantin Käfer
917c0168ab don't include the source file in every library 2014-12-09 14:14:11 +01:00
Leith Bade
c55cd7f473 Check for running services 2014-12-09 23:04:27 +11:00
Leith Bade
3c8fb1d32e Remove NDK submodule 2014-12-09 22:47:27 +11:00
Leith Bade
6fecb80405 Go back to 7z NDK 2014-12-09 22:44:12 +11:00
Leith Bade
2967bd85e4 Fix path to NDK 2014-12-09 22:41:59 +11:00
Leith Bade
d2792e2987 Tidy up HeadlessView 2014-12-09 21:47:30 +11:00