summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-02-28 17:01:49 -0800
committerKonstantin Käfer <mail@kkaefer.com>2017-02-28 18:28:41 -0800
commitc3ed1f51ca677c8c2045320fe13ec881cbd94772 (patch)
treeb6b3172e0e5f62d89aa54f46c62d681585305c5d
parent4b81c924cc52e557fcae63725cd07a052ad1f4f7 (diff)
downloadqtlocation-mapboxgl-c3ed1f51ca677c8c2045320fe13ec881cbd94772.tar.gz
[core] remove gl.hpp include from shader headers
Diffstat
-rwxr-xr-xscripts/generate-shaders.js2
-rw-r--r--src/mbgl/shaders/circle.hpp2
-rw-r--r--src/mbgl/shaders/collision_box.hpp2
-rw-r--r--src/mbgl/shaders/debug.hpp2
-rw-r--r--src/mbgl/shaders/fill.hpp2
-rw-r--r--src/mbgl/shaders/fill_outline.hpp2
-rw-r--r--src/mbgl/shaders/fill_outline_pattern.hpp2
-rw-r--r--src/mbgl/shaders/fill_pattern.hpp2
-rw-r--r--src/mbgl/shaders/line.hpp2
-rw-r--r--src/mbgl/shaders/line_pattern.hpp2
-rw-r--r--src/mbgl/shaders/line_sdf.hpp2
-rw-r--r--src/mbgl/shaders/raster.hpp2
-rw-r--r--src/mbgl/shaders/symbol_icon.hpp2
-rw-r--r--src/mbgl/shaders/symbol_sdf.hpp2
14 files changed, 0 insertions, 28 deletions
diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js
index 97b5bd11bc..2949ebd007 100755
--- a/scripts/generate-shaders.js
+++ b/scripts/generate-shaders.js
@@ -65,8 +65,6 @@ require('./style-code');
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/circle.hpp b/src/mbgl/shaders/circle.hpp
index 51c3d41db2..d14b26b783 100644
--- a/src/mbgl/shaders/circle.hpp
+++ b/src/mbgl/shaders/circle.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/collision_box.hpp b/src/mbgl/shaders/collision_box.hpp
index 7a31c919da..e0f70c7968 100644
--- a/src/mbgl/shaders/collision_box.hpp
+++ b/src/mbgl/shaders/collision_box.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/debug.hpp b/src/mbgl/shaders/debug.hpp
index 0eb3281f78..207c7bf075 100644
--- a/src/mbgl/shaders/debug.hpp
+++ b/src/mbgl/shaders/debug.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/fill.hpp b/src/mbgl/shaders/fill.hpp
index 6fb3843c91..29fede7b55 100644
--- a/src/mbgl/shaders/fill.hpp
+++ b/src/mbgl/shaders/fill.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/fill_outline.hpp b/src/mbgl/shaders/fill_outline.hpp
index 3f2be5ac70..ef685e62fa 100644
--- a/src/mbgl/shaders/fill_outline.hpp
+++ b/src/mbgl/shaders/fill_outline.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/fill_outline_pattern.hpp b/src/mbgl/shaders/fill_outline_pattern.hpp
index 0aa73bd994..e1c7a173f4 100644
--- a/src/mbgl/shaders/fill_outline_pattern.hpp
+++ b/src/mbgl/shaders/fill_outline_pattern.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/fill_pattern.hpp b/src/mbgl/shaders/fill_pattern.hpp
index ca29e0eb99..4d09519ed8 100644
--- a/src/mbgl/shaders/fill_pattern.hpp
+++ b/src/mbgl/shaders/fill_pattern.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/line.hpp b/src/mbgl/shaders/line.hpp
index 7477514761..c0d81e6202 100644
--- a/src/mbgl/shaders/line.hpp
+++ b/src/mbgl/shaders/line.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/line_pattern.hpp b/src/mbgl/shaders/line_pattern.hpp
index 97d0261204..0394e83fe0 100644
--- a/src/mbgl/shaders/line_pattern.hpp
+++ b/src/mbgl/shaders/line_pattern.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/line_sdf.hpp b/src/mbgl/shaders/line_sdf.hpp
index 7a738b9337..1d4b566f25 100644
--- a/src/mbgl/shaders/line_sdf.hpp
+++ b/src/mbgl/shaders/line_sdf.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/raster.hpp b/src/mbgl/shaders/raster.hpp
index 34f117e14a..791e2c8be0 100644
--- a/src/mbgl/shaders/raster.hpp
+++ b/src/mbgl/shaders/raster.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/symbol_icon.hpp b/src/mbgl/shaders/symbol_icon.hpp
index 445c40f913..eccf17602d 100644
--- a/src/mbgl/shaders/symbol_icon.hpp
+++ b/src/mbgl/shaders/symbol_icon.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
diff --git a/src/mbgl/shaders/symbol_sdf.hpp b/src/mbgl/shaders/symbol_sdf.hpp
index 432f9f9313..d5761d5fdb 100644
--- a/src/mbgl/shaders/symbol_sdf.hpp
+++ b/src/mbgl/shaders/symbol_sdf.hpp
@@ -2,8 +2,6 @@
#pragma once
-#include <mbgl/gl/gl.hpp>
-
namespace mbgl {
namespace shaders {
View Lorry Controller Status