[core] move draw mode and primitives to gfx namespace

15 files changed, 26 insertions, 26 deletions

diff --git a/src/mbgl/programs/background_program.hpp b/src/mbgl/programs/background_program.hpp
index 1cdc99e0ca..0cf1b5e895 100644
--- a/src/mbgl/programs/background_program.hpp
+++ b/src/mbgl/programs/background_program.hpp
@@ -46,7 +46,7 @@ using BackgroundPatternUniforms = TypeList<
 
 class BackgroundProgram : public Program<
     shaders::background,
-    gl::Triangle,
+    gfx::Triangle,
     BackgroundLayoutAttributes,
     BackgroundUniforms,
     style::Properties<>>
@@ -57,7 +57,7 @@ public:
 
 class BackgroundPatternProgram : public Program<
     shaders::background_pattern,
-    gl::Triangle,
+    gfx::Triangle,
     BackgroundLayoutAttributes,
     BackgroundPatternUniforms,
     style::Properties<>>
diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp
index 3e59402a87..c3a6e4c205 100644
--- a/src/mbgl/programs/circle_program.hpp
+++ b/src/mbgl/programs/circle_program.hpp
@@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map);
 
 class CircleProgram : public Program<
     shaders::circle,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<
         attributes::a_pos>,
     TypeList<
diff --git a/src/mbgl/programs/clipping_mask_program.hpp b/src/mbgl/programs/clipping_mask_program.hpp
index 87111b0da9..4ce86cbf06 100644
--- a/src/mbgl/programs/clipping_mask_program.hpp
+++ b/src/mbgl/programs/clipping_mask_program.hpp
@@ -10,7 +10,7 @@ namespace mbgl {
 
 class ClippingMaskProgram : public Program<
     shaders::clipping_mask,
-    gl::Triangle,
+    gfx::Triangle,
     PositionOnlyLayoutAttributes,
     TypeList<
         uniforms::u_matrix>,
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp
index 46fe882f44..1adfadf794 100644
--- a/src/mbgl/programs/collision_box_program.hpp
+++ b/src/mbgl/programs/collision_box_program.hpp
@@ -21,7 +21,7 @@ using CollisionBoxDynamicAttributes = TypeList<attributes::a_placed>;
 
 class CollisionBoxProgram : public Program<
     shaders::collision_box,
-    gl::Line,
+    gfx::Line,
     TypeListConcat<CollisionBoxLayoutAttributes, CollisionBoxDynamicAttributes>,
     TypeList<
         uniforms::u_matrix,
@@ -107,7 +107,7 @@ public:
 
 class CollisionCircleProgram : public Program<
     shaders::collision_circle,
-    gl::Triangle,
+    gfx::Triangle,
     TypeListConcat<CollisionBoxLayoutAttributes, CollisionBoxDynamicAttributes>,
     TypeList<
         uniforms::u_matrix,
diff --git a/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp
index 17e7d638f9..2827f52d53 100644
--- a/src/mbgl/programs/debug_program.hpp
+++ b/src/mbgl/programs/debug_program.hpp
@@ -10,7 +10,7 @@ namespace mbgl {
 
 class DebugProgram : public Program<
     shaders::debug,
-    gl::Line,
+    gfx::Line,
     TypeList<
         attributes::a_pos>,
     TypeList<
diff --git a/src/mbgl/programs/extrusion_texture_program.hpp b/src/mbgl/programs/extrusion_texture_program.hpp
index d1ae773f90..606909f54e 100644
--- a/src/mbgl/programs/extrusion_texture_program.hpp
+++ b/src/mbgl/programs/extrusion_texture_program.hpp
@@ -11,7 +11,7 @@ namespace mbgl {
 
 class ExtrusionTextureProgram : public Program<
     shaders::extrusion_texture,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<attributes::a_pos>,
     TypeList<
         uniforms::u_matrix,
diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp
index 4b8c148f11..548fb15d55 100644
--- a/src/mbgl/programs/fill_extrusion_program.hpp
+++ b/src/mbgl/programs/fill_extrusion_program.hpp
@@ -54,7 +54,7 @@ using FillExtrusionPatternUniforms = TypeList<
 
 class FillExtrusionProgram : public Program<
     shaders::fill_extrusion,
-    gl::Triangle,
+    gfx::Triangle,
     FillExtrusionLayoutAttributes,
     FillExtrusionUniforms,
     style::FillExtrusionPaintProperties>
@@ -90,7 +90,7 @@ public:
 
 class FillExtrusionPatternProgram : public Program<
     shaders::fill_extrusion_pattern,
-    gl::Triangle,
+    gfx::Triangle,
     FillExtrusionLayoutAttributes,
     FillExtrusionPatternUniforms,
     style::FillExtrusionPaintProperties>
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index b0037ca7f9..863671bbb9 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -39,7 +39,7 @@ using FillPatternUniforms = TypeList<
 
 class FillProgram : public Program<
     shaders::fill,
-    gl::Triangle,
+    gfx::Triangle,
     FillLayoutAttributes,
     FillUniforms,
     style::FillPaintProperties>
@@ -59,7 +59,7 @@ public:
 
 class FillPatternProgram : public Program<
     shaders::fill_pattern,
-    gl::Triangle,
+    gfx::Triangle,
     FillLayoutAttributes,
     FillPatternUniforms,
     style::FillPaintProperties>
@@ -78,7 +78,7 @@ public:
 
 class FillOutlineProgram : public Program<
     shaders::fill_outline,
-    gl::Line,
+    gfx::Line,
     FillLayoutAttributes,
     FillUniforms,
     style::FillPaintProperties>
@@ -89,7 +89,7 @@ public:
 
 class FillOutlinePatternProgram : public Program<
     shaders::fill_outline_pattern,
-    gl::Line,
+    gfx::Line,
     FillLayoutAttributes,
     FillPatternUniforms,
     style::FillPaintProperties>
diff --git a/src/mbgl/programs/heatmap_program.hpp b/src/mbgl/programs/heatmap_program.hpp
index d2fe0320ab..23021c7d5d 100644
--- a/src/mbgl/programs/heatmap_program.hpp
+++ b/src/mbgl/programs/heatmap_program.hpp
@@ -16,7 +16,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_intensity);
 
 class HeatmapProgram : public Program<
     shaders::heatmap,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<
         attributes::a_pos>,
     TypeList<
diff --git a/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp
index dea33edc03..6d07b2cfb9 100644
--- a/src/mbgl/programs/heatmap_texture_program.hpp
+++ b/src/mbgl/programs/heatmap_texture_program.hpp
@@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(uint32_t, u_color_ramp);
 
 class HeatmapTextureProgram : public Program<
     shaders::heatmap_texture,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<attributes::a_pos>,
     TypeList<
         uniforms::u_matrix,
diff --git a/src/mbgl/programs/hillshade_prepare_program.hpp b/src/mbgl/programs/hillshade_prepare_program.hpp
index 10decd0343..5265c83f4c 100644
--- a/src/mbgl/programs/hillshade_prepare_program.hpp
+++ b/src/mbgl/programs/hillshade_prepare_program.hpp
@@ -15,7 +15,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_maxzoom);
 
 class HillshadePrepareProgram : public Program<
     shaders::hillshade_prepare,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<
         attributes::a_pos,
         attributes::a_texture_pos>,
diff --git a/src/mbgl/programs/hillshade_program.hpp b/src/mbgl/programs/hillshade_program.hpp
index 9c71afdb9c..8592f248e5 100644
--- a/src/mbgl/programs/hillshade_program.hpp
+++ b/src/mbgl/programs/hillshade_program.hpp
@@ -20,7 +20,7 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_latrange);
 
 class HillshadeProgram : public Program<
     shaders::hillshade,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<
         attributes::a_pos,
         attributes::a_texture_pos>,
diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp
index 1c96ecbf34..e35c11a29c 100644
--- a/src/mbgl/programs/line_program.hpp
+++ b/src/mbgl/programs/line_program.hpp
@@ -35,7 +35,7 @@ using LineLayoutAttributes = TypeList<
 
 class LineProgram : public Program<
     shaders::line,
-    gl::Triangle,
+    gfx::Triangle,
     LineLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
@@ -99,7 +99,7 @@ public:
 
 class LinePatternProgram : public Program<
     shaders::line_pattern,
-    gl::Triangle,
+    gfx::Triangle,
     LineLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
@@ -125,7 +125,7 @@ public:
 
 class LineSDFProgram : public Program<
     shaders::line_sdf,
-    gl::Triangle,
+    gfx::Triangle,
     LineLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
@@ -156,7 +156,7 @@ public:
 
 class LineGradientProgram : public Program<
     shaders::line_gradient,
-    gl::Triangle,
+    gfx::Triangle,
     LineLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp
index 45b324696d..90d444a2d4 100644
--- a/src/mbgl/programs/raster_program.hpp
+++ b/src/mbgl/programs/raster_program.hpp
@@ -25,7 +25,7 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_tl_parent);
 
 class RasterProgram : public Program<
     shaders::raster,
-    gl::Triangle,
+    gfx::Triangle,
     TypeList<
         attributes::a_pos,
         attributes::a_texture_pos>,
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index d6bad6da77..ebe40f15b4 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -341,7 +341,7 @@ public:
 
 class SymbolIconProgram : public SymbolProgram<
     shaders::symbol_icon,
-    gl::Triangle,
+    gfx::Triangle,
     SymbolLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
@@ -380,7 +380,7 @@ enum class SymbolSDFPart {
 template <class PaintProperties>
 class SymbolSDFProgram : public SymbolProgram<
     shaders::symbol_sdf,
-    gl::Triangle,
+    gfx::Triangle,
     SymbolLayoutAttributes,
     TypeList<
         uniforms::u_matrix,
@@ -402,7 +402,7 @@ class SymbolSDFProgram : public SymbolProgram<
 {
 public:
     using BaseProgram = SymbolProgram<shaders::symbol_sdf,
-        gl::Triangle,
+        gfx::Triangle,
         SymbolLayoutAttributes,
         TypeList<
             uniforms::u_matrix,