diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-04-10 17:16:45 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-04-10 18:01:28 +0300 |
| commit | a9e09c710e6b07be425640bd323200963e22d825 (patch) | |
| tree | 9d92165cb231fb9cb2bf5a283e5500b2769e2d29 | |
| parent | 3ad527a59ddb83d2a5add7b4c2678559b4678697 (diff) | |
| download | qtlocation-mapboxgl-a9e09c710e6b07be425640bd323200963e22d825.tar.gz | |
[ios, macos] MGLMapView size check for OpenGL 2.0 ES minimum texture size
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 7 | ||||
| -rw-r--r-- | 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 d80e741c00..212f8934e4 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -576,8 +576,11 @@ public: - (mbgl::Size)size { - return { static_cast<uint32_t>(self.bounds.size.width), - static_cast<uint32_t>(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<uint32_t>(size.width), + static_cast<uint32_t>(size.height) }; } - (mbgl::Size)framebufferSize diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index e19755044b..5d14192c61 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -307,8 +307,11 @@ public: } - (mbgl::Size)size { - return { static_cast<uint32_t>(self.bounds.size.width), - static_cast<uint32_t>(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<uint32_t>(size.width), + static_cast<uint32_t>(size.height) }; } - (mbgl::Size)framebufferSize { |