Mike Morris
|
e8a2c39365
|
forward declare GLX typedefs to limit conflicts from glx.h
|
2015-02-10 13:38:45 -08:00 |
|
Leith Bade
|
89bbd29278
|
Use std::chrono
|
2015-02-04 09:39:25 +11:00 |
|
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 |
|
Konstantin Käfer
|
40a5bcd7d3
|
never create core profile contexts; their API is subtly different
(e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
|
2014-12-16 11:10:41 +00:00 |
|
Konstantin Käfer
|
9082a83d6a
|
don't assing nullptr to std::string
|
2014-12-16 11:42:58 +01: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 |
|
Konstantin Käfer
|
5ccc988ff7
|
fix typo
|
2014-12-09 14:55:32 +01: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
|
14cdd9c96f
|
Rename lots of things
|
2014-12-04 01:10:43 +11:00 |
|
Leith Bade
|
94d34ce7ac
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/map/map.cpp
|
2014-12-03 22:02:55 +11:00 |
|
Konstantin Käfer
|
82f3574d09
|
add array overloads to make_unique and move it to mbgl::util from std
|
2014-12-03 11:27:24 +01:00 |
|
Leith Bade
|
0935cef9c3
|
Fix tests when using GL 3.0+ context
|
2014-12-02 21:40:23 +11:00 |
|
Mike Morris
|
7e7b85e132
|
fix memcpy includes/namespace
|
2014-12-01 13:49:47 -08:00 |
|
Mike Morris
|
0fd7f26533
|
move pixel flip from headless test into HeadlessView::readPixels
|
2014-12-01 16:36:11 -05:00 |
|
Mike Morris
|
c542bd1140
|
repair undef None GLX wrapper, pass 0 instead of None to GLX functions
|
2014-11-10 15:06:56 -05: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
|
e3bc69b7e7
|
use CoreImage for decoding/encoding images on osx/ios
|
2014-10-30 12:02:28 -04:00 |
|
Konstantin Käfer
|
0e928b5204
|
make tests work
|
2014-10-24 17:44:51 +02: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 |
|