From a9e09c710e6b07be425640bd323200963e22d825 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 10 Apr 2017 17:16:45 +0300 Subject: [PATCH] [ios, macos] MGLMapView size check for OpenGL 2.0 ES minimum texture size --- platform/ios/src/MGLMapView.mm | 7 +++++-- platform/macos/src/MGLMapView.mm | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index d80e741c0..212f8934e 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -576,8 +576,11 @@ public: - (mbgl::Size)size { - return { static_cast(self.bounds.size.width), - static_cast(self.bounds.size.height) }; + // check for minimum texture size supported by OpenGL ES 2.0 + // + CGSize size = CGSizeMake(MAX(self.bounds.size.width, 64), MAX(self.bounds.size.height, 64)); + return { static_cast(size.width), + static_cast(size.height) }; } - (mbgl::Size)framebufferSize diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index e19755044..5d14192c6 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -307,8 +307,11 @@ public: } - (mbgl::Size)size { - return { static_cast(self.bounds.size.width), - static_cast(self.bounds.size.height) }; + // check for minimum texture size supported by OpenGL ES 2.0 + // + CGSize size = CGSizeMake(MAX(self.bounds.size.width, 64), MAX(self.bounds.size.height, 64)); + return { static_cast(size.width), + static_cast(size.height) }; } - (mbgl::Size)framebufferSize {