diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-23 19:15:10 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-24 19:58:24 +0300 |
| commit | 1769e6fcb42d41e042c488bf2023fed360b87357 (patch) | |
| tree | 4febd99199574ecc2a84bcc2012ae7c80e445c53 /include | |
| parent | 876bf0687a6e2b6b5dd491b65dad587c688aa56d (diff) | |
| download | qtlocation-mapboxgl-1769e6fcb42d41e042c488bf2023fed360b87357.tar.gz | |
[core] Move GLFW stencil clip debug to core
This makes the stencil clip debug available to all platforms.
Fixes #4669.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/mode.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/platform/default/glfw_view.hpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp index ae4328d6fd..d94cdc0eb5 100644 --- a/include/mbgl/map/mode.hpp +++ b/include/mbgl/map/mode.hpp @@ -43,6 +43,10 @@ enum class MapDebugOptions : EnumType { Timestamps = 1 << 3, Collision = 1 << 4, Wireframe = 1 << 5, +// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/5117 +#ifndef GL_ES_VERSION_2_0 + StencilClip = 1 << 6, +#endif // GL_ES_VERSION_2_0 }; inline MapDebugOptions operator| (const MapDebugOptions& lhs, const MapDebugOptions& rhs) { diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index 3b74618e3e..80cf028f79 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -49,9 +49,6 @@ private: makeSpriteImage(int width, int height, float pixelRatio); void nextOrientation(); - void toggleClipMasks(); - - void renderClipMasks(); void addRandomPointAnnotations(int count); void addRandomShapeAnnotations(int count); @@ -81,8 +78,6 @@ private: int fbHeight; float pixelRatio; - bool showClipMasks = false; - double lastX = 0, lastY = 0; double lastClick = -1; |