diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-07 00:29:20 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-07 00:29:20 +1100 |
| commit | b534520d6c60d45555e8a704ebeaec70800f0eaa (patch) | |
| tree | 9da36f6adafadfae47f2e7660e8e8fff36e371d8 /src/mbgl/platform | |
| parent | f2776c0854067e31391bff129bcfe9e7fbd72cf1 (diff) | |
| parent | 004d12ea0b89d5fe369ab5631e20cc7e2caef429 (diff) | |
| download | qtlocation-mapboxgl-b534520d6c60d45555e8a704ebeaec70800f0eaa.tar.gz | |
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
Diffstat (limited to 'src/mbgl/platform')
| -rw-r--r-- | src/mbgl/platform/gl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp index 155fd70d95..f99883a4e5 100644 --- a/src/mbgl/platform/gl.cpp +++ b/src/mbgl/platform/gl.cpp @@ -70,12 +70,14 @@ PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays = nullptr; PFNGLGENVERTEXARRAYSPROC GenVertexArrays = nullptr; PFNGLISVERTEXARRAYPROC IsVertexArray = nullptr; -// GL_OES_packed_depth_stencil bool isPackedDepthStencilSupported = false; -// GL_OES_depth24 bool isDepth24Supported = false; +PFNGLGETPROGRAMBINARYPROC GetProgramBinary = nullptr; +PFNGLPROGRAMBINARYPROC ProgramBinary = nullptr; +PFNGLPROGRAMPARAMETERIPROC ProgramParameteri = nullptr; + } } |