summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-04-02 18:22:16 +0300
committerTobrun <tobrun.van.nuland@gmail.com>2019-04-08 11:10:01 +0200
commit4b63580c26b088c21fabb93cfc2e41f98deabaa7 (patch)
tree14aa5e44eb3013cab637fec2838b683b3358133e
parent4928c6eecc9955f416913b804e8f11e06a220257 (diff)
downloadqtlocation-mapboxgl-4b63580c26b088c21fabb93cfc2e41f98deabaa7.tar.gz
[core] Disable binary programs until we fix #14294
-rw-r--r--src/mbgl/gl/context.hpp2
-rw-r--r--src/mbgl/gl/features.hpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 6ffa5d45b0..fdc1fb7488 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -56,7 +56,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