From 97f2a448594d7f904f298c61ab7ba673418d36e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 20 Apr 2017 10:28:05 +0200 Subject: [PATCH] [core] remove unused leftover files --- cmake/core-files.cmake | 2 ++ src/mbgl/gl/features.hpp | 2 +- src/mbgl/gl/program_binary.cpp | 24 ------------------------ src/mbgl/gl/program_binary.hpp | 27 --------------------------- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 src/mbgl/gl/program_binary.cpp delete mode 100644 src/mbgl/gl/program_binary.hpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 98c51b2d5..0ea01992d 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 04dc4fa02..175709396 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 ad147c819..000000000 --- a/src/mbgl/gl/program_binary.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include - -#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 - 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 e888ed3d4..000000000 --- a/src/mbgl/gl/program_binary.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include -#include -#include - -#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 - GetProgramBinary; - -extern ExtensionFunction - ProgramBinary; - -} // namespace gl -} // namespace mbgl - -#endif