diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-04 18:03:29 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-04 21:24:05 +0100 |
| commit | afd43eea3aeaf1123a75637d6b008971a3519396 (patch) | |
| tree | 616f3ea42fb070c02aa0ba225e59371c7d9d8549 /src/mbgl/renderer | |
| parent | 7b772611d576ed99b148208c21824bb089663599 (diff) | |
| download | qtlocation-mapboxgl-afd43eea3aeaf1123a75637d6b008971a3519396.tar.gz | |
[core] remove gl.hpp from all headers that don't need it
Diffstat (limited to 'src/mbgl/renderer')
| -rw-r--r-- | src/mbgl/renderer/debug_bucket.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/fill_bucket.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/frame_history.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 3 |
4 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp index a9ef551fba..14b3976169 100644 --- a/src/mbgl/renderer/debug_bucket.cpp +++ b/src/mbgl/renderer/debug_bucket.cpp @@ -5,8 +5,6 @@ #include <mbgl/geometry/debug_font_data.hpp> #include <mbgl/util/string.hpp> -#include <mbgl/gl/gl.hpp> - #include <cmath> #include <string> #include <vector> diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index 6a5cc09e6a..9a6f31cbfc 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -5,7 +5,6 @@ #include <mbgl/shader/fill_pattern_shader.hpp> #include <mbgl/shader/fill_outline_shader.hpp> #include <mbgl/shader/fill_outline_pattern_shader.hpp> -#include <mbgl/gl/gl.hpp> #include <mbgl/platform/log.hpp> #include <mapbox/earcut.hpp> diff --git a/src/mbgl/renderer/frame_history.cpp b/src/mbgl/renderer/frame_history.cpp index d77c89a1bd..1ee53d87b2 100644 --- a/src/mbgl/renderer/frame_history.cpp +++ b/src/mbgl/renderer/frame_history.cpp @@ -1,7 +1,6 @@ #include <mbgl/renderer/frame_history.hpp> #include <mbgl/math/minmax.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/gl/gl.hpp> #include <cassert> diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 303de91025..7ab7b741ea 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -8,7 +8,6 @@ #include <mbgl/map/view.hpp> #include <mbgl/platform/log.hpp> -#include <mbgl/gl/gl.hpp> #include <mbgl/gl/debugging.hpp> #include <mbgl/style/style.hpp> @@ -197,7 +196,7 @@ void Painter::render(const Style& style, const FrameData& frame_, View& view, Sp renderPass(parameters, RenderPass::Translucent, order.begin(), order.end(), - static_cast<GLsizei>(order.size()) - 1, -1); + static_cast<uint32_t>(order.size()) - 1, -1); if (debug::renderTree) { Log::Info(Event::Render, "}"); indent--; } |