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 /include | |
| 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 'include')
| -rw-r--r-- | include/mbgl/platform/gl.hpp | 13 | ||||
| -rw-r--r-- | include/mbgl/platform/platform.hpp | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp index 53386626a0..ba1ac9f008 100644 --- a/include/mbgl/platform/gl.hpp +++ b/include/mbgl/platform/gl.hpp @@ -119,6 +119,7 @@ typedef void (* PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei extern PFNGLLABELOBJECTEXTPROC LabelObjectEXT; extern PFNGLGETOBJECTLABELEXTPROC GetObjectLabelEXT; +// GL_ARB_vertex_array_object / GL_OES_vertex_array_object #define GL_VERTEX_ARRAY_BINDING 0x85B5 typedef void (* PFNGLBINDVERTEXARRAYPROC) (GLuint array); typedef void (* PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays); @@ -135,6 +136,18 @@ extern bool isPackedDepthStencilSupported; extern bool isDepth24Supported; #define GL_DEPTH_COMPONENT24 0x81A6 +// GL_ARB_get_program_binary / GL_OES_get_program_binary +#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 +#define GL_PROGRAM_BINARY_LENGTH 0x8741 +#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE +#define GL_PROGRAM_BINARY_FORMATS 0x87FF +typedef void (* PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary); +typedef void (* PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); +typedef void (* PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); +extern PFNGLGETPROGRAMBINARYPROC GetProgramBinary; +extern PFNGLPROGRAMBINARYPROC ProgramBinary; +extern PFNGLPROGRAMPARAMETERIPROC ProgramParameteri; + // Debug group markers, useful for debugging on iOS #if defined(DEBUG) // static int indent = 0; diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index b7107bb9cd..9edcc23ccd 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -20,6 +20,9 @@ std::string lowercase(const std::string &string); // Returns the path to the default cache database on this system. std::string defaultCacheDatabase(); +// Returns the path to the default shader cache on this system. +std::string defaultShaderCache(); + // Shows an alpha image with the specified dimensions in a named window. void show_debug_image(std::string name, const char *data, size_t width, size_t height); |