From b2e416bbcf0d850cdd56546a2f917ef4e1ed35e1 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 2 Apr 2019 18:22:16 +0300 Subject: [core] Disable binary programs until we fix #14294 --- src/mbgl/gl/context.hpp | 2 +- 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> 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 -- cgit v1.2.1