Leith Bade
ff3ea3e20b
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/map/map.cpp
2014-12-23 11:33:26 +13:00
Leith Bade
0771e50460
Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656
2014-12-23 09:29:45 +13:00
Leith Bade
df19683b6a
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
Makefile
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
2014-12-21 15:02:47 +13:00
Leith Bade
15b47197a7
Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINARY_FORMATS > 0.
2014-12-20 15:08:06 +13: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
93d56294cf
update error reporting function
2014-12-10 13:21:08 +01: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
d2792e2987
Tidy up HeadlessView
2014-12-09 21:47:30 +11:00
Leith Bade
886b622a92
Add pakced depth stencil to GLFWView and HeadlessView
2014-12-07 00:40:44 +11:00
Leith Bade
b534520d6c
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/platform/gl.hpp
src/mbgl/platform/gl.cpp
src/mbgl/shader/shader.cpp
2014-12-07 00:29:20 +11:00
Leith Bade
6df4e4a52c
Load program binary extension on Linux
2014-12-06 14:21:08 +11:00
Leith Bade
de9eb00276
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
.gitignore
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
include/mbgl/map/map.hpp
src/mbgl/map/map.cpp
src/mbgl/storage/caching_http_file_source.cpp
2014-12-05 23:16:49 +11:00
John Firebaugh
0a942b6f14
Change Map::stop to use std::function<void()>
...
Fixes #685
2014-12-04 15:58:04 -08:00
John Firebaugh
9aff2c386c
Remove invalid map->terminate()
...
Map has already been destroyed by this point, so the
call is invalid. The work that terminate() would do
has already been done.
2014-12-04 14:31:29 -08:00
Konstantin Käfer
b449b22abc
remove use of std::to_string in favor of boost::lexical_cast
...
std::to_string calls sprintf() internally, which is really slow
2014-12-04 12:59:09 +01:00
Leith Bade
6be8c840bb
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
2014-12-03 23:03:14 +11:00
Konstantin Käfer
dbdc64592c
don't set the window title on every frame
...
this is a significant performance penalty, at least on OS X, and drops our frame rate below 60fps on even simple scenes. instead of showing the position of the map in the window, we should display it elsewhere
2014-12-03 11:59:39 +01:00
Leith Bade
e16f9cb291
Fix accidentally commented code
2014-12-03 20:47:05 +11:00
Leith Bade
0935cef9c3
Fix tests when using GL 3.0+ context
2014-12-02 21:40:23 +11:00
Leith Bade
2800f36142
Add debug markers and labels
2014-12-02 03:24:42 +11:00
Leith Bade
66349e33ab
Add GL_ARB_debug_output
2014-12-02 03:09:09 +11:00
Leith Bade
6998c6ecb9
Load KHR_debug on Linux
2014-12-02 00:44:08 +11:00
Leith Bade
c8552e1b28
Fix VAOs on Linux
2014-12-02 00:05:45 +11:00
Konstantin Käfer
8fe8b2f739
add glx support
2014-11-07 09:38:07 -08:00
Konstantin Käfer
582d616deb
load VAO extension
2014-11-07 18:17:24 +01:00
Konstantin Käfer
d299e58088
Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
...
Conflicts:
Makefile
ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a
restructure gyp files
2014-10-24 16:40:08 +02:00
