diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 15:24:02 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 15:24:02 +0200 |
commit | 18b1469e9ebd02465101fbea719c9c967d334072 (patch) | |
tree | b643749b146c1b31f9b2142dc731d324dd8f1103 /include/mbgl | |
parent | 64d5cea94f76499a52fb913ebf3b1f35c486322d (diff) | |
download | qtlocation-mapboxgl-18b1469e9ebd02465101fbea719c9c967d334072.tar.gz |
use unified RenderPass type
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/map/map.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/renderer/painter.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index b837f79282..14f8f40916 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -45,8 +45,6 @@ public: // Triggers a lazy rerender: only performs a render when the map is not clean. void rerender(); - enum RenderPass { Opaque, Translucent }; - void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); // Forces a map update: always triggers a rerender. diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 710e6134b7..385e8bdd0e 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -29,6 +29,8 @@ namespace mbgl { +enum class RenderPass : bool { Opaque, Translucent }; + class Transform; class Style; class Tile; @@ -154,7 +156,7 @@ private: bool gl_depthMask = true; std::array<uint16_t, 2> gl_viewport = {{ 0, 0 }}; float strata = 0; - enum { Opaque, Translucent } pass = Opaque; + RenderPass pass = RenderPass::Opaque; const float strata_epsilon = 1.0f / (1 << 16); public: |