diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-04-20 10:28:05 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-20 20:04:33 +0200 |
| commit | 97f2a448594d7f904f298c61ab7ba673418d36e5 (patch) | |
| tree | 82f35151c62efddce5e58f4557222c1df3f51467 | |
| parent | 0d1d0efd60b306f349943e886345b283b4164ebc (diff) | |
| download | qtlocation-mapboxgl-97f2a448594d7f904f298c61ab7ba673418d36e5.tar.gz | |
[core] remove unused leftover files
| -rw-r--r-- | cmake/core-files.cmake | 2 | ||||
| -rw-r--r-- | src/mbgl/gl/features.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/gl/program_binary.cpp | 24 | ||||
| -rw-r--r-- | src/mbgl/gl/program_binary.hpp | 27 |
4 files changed, 3 insertions, 52 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 98c51b2d5d..0ea01992de 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -270,6 +270,7 @@ set(MBGL_CORE_FILES src/mbgl/style/observer.hpp src/mbgl/style/paint_property.hpp src/mbgl/style/paint_property_binder.hpp + src/mbgl/style/paint_property_statistics.hpp src/mbgl/style/parser.cpp src/mbgl/style/parser.hpp src/mbgl/style/possibly_evaluated_property_value.hpp @@ -431,6 +432,7 @@ set(MBGL_CORE_FILES src/mbgl/tile/vector_tile.hpp # util + include/mbgl/util/any.hpp include/mbgl/util/async_request.hpp include/mbgl/util/async_task.hpp include/mbgl/util/char_array_buffer.hpp diff --git a/src/mbgl/gl/features.hpp b/src/mbgl/gl/features.hpp index 04dc4fa02e..1757093967 100644 --- a/src/mbgl/gl/features.hpp +++ b/src/mbgl/gl/features.hpp @@ -4,4 +4,4 @@ #define MBGL_HAS_BINARY_PROGRAMS 0 #else #define MBGL_HAS_BINARY_PROGRAMS 1 -#endif
\ No newline at end of file +#endif diff --git a/src/mbgl/gl/program_binary.cpp b/src/mbgl/gl/program_binary.cpp deleted file mode 100644 index ad147c819f..0000000000 --- a/src/mbgl/gl/program_binary.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include <mbgl/gl/program_binary.hpp> - -#if MBGL_HAS_BINARY_PROGRAMS - -namespace mbgl { -namespace gl { - -ExtensionFunction< - void(GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary)> - GetProgramBinary({ - { "GL_OES_get_program_binary", "glGetProgramBinaryOES" }, - { "GL_ARB_get_program_binary", "glGetProgramBinary" }, - }); - -ExtensionFunction<void(GLuint program, GLenum binaryFormat, const GLvoid* binary, GLint length)> - ProgramBinary({ - { "GL_OES_get_program_binary", "glProgramBinaryOES" }, - { "GL_ARB_get_program_binary", "glProgramBinary" }, - }); - -} // namespace gl -} // namespace mbgl - -#endif diff --git a/src/mbgl/gl/program_binary.hpp b/src/mbgl/gl/program_binary.hpp deleted file mode 100644 index e888ed3d4a..0000000000 --- a/src/mbgl/gl/program_binary.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include <mbgl/gl/features.hpp> -#include <mbgl/gl/extension.hpp> -#include <mbgl/gl/gl.hpp> - -#if MBGL_HAS_BINARY_PROGRAMS - -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF - -namespace mbgl { -namespace gl { - -extern ExtensionFunction<void( - GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary)> - GetProgramBinary; - -extern ExtensionFunction<void( - GLuint program, GLenum binaryFormat, const GLvoid* binary, GLint length)> - ProgramBinary; - -} // namespace gl -} // namespace mbgl - -#endif |