diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-04-02 18:22:16 +0300 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-04-03 09:06:23 +0200 |
| commit | b2e416bbcf0d850cdd56546a2f917ef4e1ed35e1 (patch) | |
| tree | 31e020dec01caa4b6d2d5f710cbfc0005292f0fa | |
| parent | 755c344c460bbd6d3a42d37cf65ab1c3005d2342 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-cp-disable-shader.tar.gz | |
[core] Disable binary programs until we fix #14294upstream/tvn-cp-disable-shader
| -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 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 |