diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-04-02 23:22:16 +0800 |
---|---|---|
committer | kevin <kevin.li@mapbox.com> | 2019-05-15 11:19:04 +0800 |
commit | 215da302e1760f1de84f1fa43894c62a39d8972e (patch) | |
tree | bd68681a0a9cba5ef616071a7703c0ed240d191b | |
parent | b23a6122259cac97f174dddb978437dd3a58a5df (diff) | |
download | qtlocation-mapboxgl-215da302e1760f1de84f1fa43894c62a39d8972e.tar.gz |
[core] Disable binary programs until we fix #14294
(cherry picked from commit 805b1402452da74042b995d693c48ee4b79ae337)
-rw-r--r-- | src/mbgl/gl/context.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/gl/features.hpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index bd682f44da..5cf3c919bc 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -58,7 +58,7 @@ public: #if MBGL_HAS_BINARY_PROGRAMS bool supportsProgramBinaries() const; #else - constexpr bool supportsProgramBinaries() const { return false; } + constexpr static bool supportsProgramBinaries() { return false; } #endif optional<std::pair<BinaryProgramFormat, std::string>> getBinaryProgram(ProgramID) const; diff --git a/src/mbgl/gl/features.hpp b/src/mbgl/gl/features.hpp index 1757093967..1da1371e45 100644 --- a/src/mbgl/gl/features.hpp +++ b/src/mbgl/gl/features.hpp @@ -3,5 +3,6 @@ #if __APPLE__ #define MBGL_HAS_BINARY_PROGRAMS 0 #else - #define MBGL_HAS_BINARY_PROGRAMS 1 + // https://github.com/mapbox/mapbox-gl-native/issues/14294 + #define MBGL_HAS_BINARY_PROGRAMS 0 #endif |