From c3ed1f51ca677c8c2045320fe13ec881cbd94772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 28 Feb 2017 17:01:49 -0800 Subject: [PATCH] [core] remove gl.hpp include from shader headers --- scripts/generate-shaders.js | 2 -- src/mbgl/shaders/circle.hpp | 2 -- src/mbgl/shaders/collision_box.hpp | 2 -- src/mbgl/shaders/debug.hpp | 2 -- src/mbgl/shaders/fill.hpp | 2 -- src/mbgl/shaders/fill_outline.hpp | 2 -- src/mbgl/shaders/fill_outline_pattern.hpp | 2 -- src/mbgl/shaders/fill_pattern.hpp | 2 -- src/mbgl/shaders/line.hpp | 2 -- src/mbgl/shaders/line_pattern.hpp | 2 -- src/mbgl/shaders/line_sdf.hpp | 2 -- src/mbgl/shaders/raster.hpp | 2 -- src/mbgl/shaders/symbol_icon.hpp | 2 -- src/mbgl/shaders/symbol_sdf.hpp | 2 -- 14 files changed, 28 deletions(-) diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index 97b5bd11b..2949ebd00 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -65,8 +65,6 @@ require('./style-code'); #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/circle.hpp b/src/mbgl/shaders/circle.hpp index 51c3d41db..d14b26b78 100644 --- a/src/mbgl/shaders/circle.hpp +++ b/src/mbgl/shaders/circle.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/collision_box.hpp b/src/mbgl/shaders/collision_box.hpp index 7a31c919d..e0f70c796 100644 --- a/src/mbgl/shaders/collision_box.hpp +++ b/src/mbgl/shaders/collision_box.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/debug.hpp b/src/mbgl/shaders/debug.hpp index 0eb3281f7..207c7bf07 100644 --- a/src/mbgl/shaders/debug.hpp +++ b/src/mbgl/shaders/debug.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/fill.hpp b/src/mbgl/shaders/fill.hpp index 6fb3843c9..29fede7b5 100644 --- a/src/mbgl/shaders/fill.hpp +++ b/src/mbgl/shaders/fill.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/fill_outline.hpp b/src/mbgl/shaders/fill_outline.hpp index 3f2be5ac7..ef685e62f 100644 --- a/src/mbgl/shaders/fill_outline.hpp +++ b/src/mbgl/shaders/fill_outline.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/fill_outline_pattern.hpp b/src/mbgl/shaders/fill_outline_pattern.hpp index 0aa73bd99..e1c7a173f 100644 --- a/src/mbgl/shaders/fill_outline_pattern.hpp +++ b/src/mbgl/shaders/fill_outline_pattern.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/fill_pattern.hpp b/src/mbgl/shaders/fill_pattern.hpp index ca29e0eb9..4d09519ed 100644 --- a/src/mbgl/shaders/fill_pattern.hpp +++ b/src/mbgl/shaders/fill_pattern.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/line.hpp b/src/mbgl/shaders/line.hpp index 747751476..c0d81e620 100644 --- a/src/mbgl/shaders/line.hpp +++ b/src/mbgl/shaders/line.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/line_pattern.hpp b/src/mbgl/shaders/line_pattern.hpp index 97d026120..0394e83fe 100644 --- a/src/mbgl/shaders/line_pattern.hpp +++ b/src/mbgl/shaders/line_pattern.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/line_sdf.hpp b/src/mbgl/shaders/line_sdf.hpp index 7a738b933..1d4b566f2 100644 --- a/src/mbgl/shaders/line_sdf.hpp +++ b/src/mbgl/shaders/line_sdf.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/raster.hpp b/src/mbgl/shaders/raster.hpp index 34f117e14..791e2c8be 100644 --- a/src/mbgl/shaders/raster.hpp +++ b/src/mbgl/shaders/raster.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/symbol_icon.hpp b/src/mbgl/shaders/symbol_icon.hpp index 445c40f91..eccf17602 100644 --- a/src/mbgl/shaders/symbol_icon.hpp +++ b/src/mbgl/shaders/symbol_icon.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders { diff --git a/src/mbgl/shaders/symbol_sdf.hpp b/src/mbgl/shaders/symbol_sdf.hpp index 432f9f931..d5761d5fd 100644 --- a/src/mbgl/shaders/symbol_sdf.hpp +++ b/src/mbgl/shaders/symbol_sdf.hpp @@ -2,8 +2,6 @@ #pragma once -#include - namespace mbgl { namespace shaders {