From afd43eea3aeaf1123a75637d6b008971a3519396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 4 Nov 2016 18:03:29 +0100
Subject: [core] remove gl.hpp from all headers that don't need it

---
 platform/macos/src/MGLOpenGLLayer.mm | 2 --
 platform/qt/src/qmapboxgl.cpp        | 1 -
 src/mbgl/geometry/line_atlas.cpp     | 1 -
 src/mbgl/renderer/debug_bucket.cpp   | 2 --
 src/mbgl/renderer/fill_bucket.cpp    | 1 -
 src/mbgl/renderer/frame_history.cpp  | 1 -
 src/mbgl/renderer/painter.cpp        | 3 +--
 src/mbgl/shader/symbol_vertex.cpp    | 1 -
 test/gl/object.test.cpp              | 1 -
 9 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/platform/macos/src/MGLOpenGLLayer.mm b/platform/macos/src/MGLOpenGLLayer.mm
index e8fa521351..296e30179b 100644
--- a/platform/macos/src/MGLOpenGLLayer.mm
+++ b/platform/macos/src/MGLOpenGLLayer.mm
@@ -2,8 +2,6 @@
 
 #import "MGLMapView_Private.h"
 
-#import <mbgl/gl/gl.hpp>
-
 @implementation MGLOpenGLLayer
 
 - (MGLMapView *)mapView {
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 3253dd3251..67743d180a 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -5,7 +5,6 @@
 #include "qt_geojson.hpp"
 
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/map/map.hpp>
diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp
index 5e11fe5c49..1dfa42fc2c 100644
--- a/src/mbgl/geometry/line_atlas.cpp
+++ b/src/mbgl/geometry/line_atlas.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/geometry/line_atlas.hpp>
-#include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
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--; }
 
diff --git a/src/mbgl/shader/symbol_vertex.cpp b/src/mbgl/shader/symbol_vertex.cpp
index 4075d749ea..e29226527f 100644
--- a/src/mbgl/shader/symbol_vertex.cpp
+++ b/src/mbgl/shader/symbol_vertex.cpp
@@ -1,6 +1,5 @@
 #include <mbgl/shader/symbol_vertex.hpp>
 #include <mbgl/gl/shader.hpp>
-#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {
 
diff --git a/test/gl/object.test.cpp b/test/gl/object.test.cpp
index 2a1ee0a1da..45a69b4c71 100644
--- a/test/gl/object.test.cpp
+++ b/test/gl/object.test.cpp
@@ -3,7 +3,6 @@
 #include <mbgl/platform/default/headless_backend.hpp>
 #include <mbgl/platform/default/offscreen_view.hpp>
 
-#include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/context.hpp>
 
 #include <memory>
-- 
cgit v1.2.1