1 files changed, 25 insertions, 132 deletions

diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp
index d5508e8f1a..42079bfd57 100644
--- a/src/mbgl/programs/attributes.hpp
+++ b/src/mbgl/programs/attributes.hpp
@@ -1,23 +1,10 @@
 #pragma once
 
-#include <mbgl/gl/attribute.hpp>
-#include <mbgl/gl/uniform.hpp>
-
-#include <cstdint>
+#include <mbgl/gfx/attribute.hpp>
 
 namespace mbgl {
 namespace attributes {
 
-/*
- * Pack a pair of values, interpreted as uint8's, into a single float.
- * Used to conserve vertex attributes. Values are unpacked in the vertex
- * shader using the `unpack_float()` function, defined in _prelude.vertex.glsl.
- */
-template <typename T>
-inline uint16_t packUint8Pair(T a, T b) {
-    return static_cast<uint16_t>(a) * 256 + static_cast<uint16_t>(b);
-}
-
 // Layout attributes
 
 MBGL_DEFINE_ATTRIBUTE(int16_t, 2, a_pos);
@@ -31,134 +18,40 @@ MBGL_DEFINE_ATTRIBUTE(uint16_t, 2, a_texture_pos);
 MBGL_DEFINE_ATTRIBUTE(int16_t,  4, a_normal_ed);
 MBGL_DEFINE_ATTRIBUTE(uint8_t, 1, a_fade_opacity);
 MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, a_placed);
+MBGL_DEFINE_ATTRIBUTE(uint16_t, 3, a_size);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_offset);
 
 template <typename T, std::size_t N>
 struct a_data {
+    using Type = gfx::AttributeType<T, N>;
     static auto name() { return "a_data"; }
-    using Type = gl::Attribute<T, N>;
-};
-
-struct a_size {
-    static auto name() { return "a_size"; }
-    using Type = gl::Attribute<uint16_t, 3>;
-};
-
-template <std::size_t N>
-struct a_offset {
-    static auto name() { return "a_offset"; }
-    using Type = gl::Attribute<int16_t, N>;
 };
 
 // Paint attributes
 
-struct a_color {
-    static auto name() { return "a_color"; }
-    using Type = gl::Attribute<float, 2>;
-};
-
-struct a_fill_color {
-    static auto name() { return "a_fill_color"; }
-    using Type = gl::Attribute<float, 2>;
-};
-
-struct a_halo_color {
-    static auto name() { return "a_halo_color"; }
-    using Type = gl::Attribute<float, 2>;
-};
-
-struct a_stroke_color {
-    static auto name() { return "a_stroke_color"; }
-    using Type = gl::Attribute<float, 2>;
-};
-
-struct a_outline_color {
-    static auto name() { return "a_outline_color"; }
-    using Type = gl::Attribute<float, 2>;
-};
-
-struct a_opacity {
-    static auto name() { return "a_opacity"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_stroke_opacity {
-    static auto name() { return "a_stroke_opacity"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_blur {
-    static auto name() { return "a_blur"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_radius {
-    static auto name() { return "a_radius"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_width {
-    static auto name() { return "a_width"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_floorwidth {
-    static auto name() { return "a_floorwidth"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_height {
-    static auto name() { return "a_height"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_base {
-    static auto name() { return "a_base"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_gapwidth {
-    static auto name() { return "a_gapwidth"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_stroke_width {
-    static auto name() { return "a_stroke_width"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-template <>
-struct a_offset<1> {
-    static auto name() { return "a_offset"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_halo_width {
-    static auto name() { return "a_halo_width"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_halo_blur {
-    static auto name() { return "a_halo_blur"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_weight {
-    static auto name() { return "a_weight"; }
-    using Type = gl::Attribute<float, 1>;
-};
-
-struct a_pattern_to {
-    static auto name() { return "a_pattern_to"; }
-    using Type = gl::Attribute<uint16_t, 4>;
-};
-
-struct a_pattern_from {
-    static auto name() { return "a_pattern_from"; }
-    using Type = gl::Attribute<uint16_t, 4>;
-};
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_color);
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_fill_color);
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_halo_color);
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_stroke_color);
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_outline_color);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_opacity);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_stroke_opacity);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_blur);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_radius);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_width);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_floorwidth);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_height);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_base);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_gapwidth);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_stroke_width);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_halo_width);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_halo_blur);
+MBGL_DEFINE_ATTRIBUTE(float, 1, a_weight);
+MBGL_DEFINE_ATTRIBUTE(uint16_t, 4, a_pattern_to);
+MBGL_DEFINE_ATTRIBUTE(uint16_t, 4, a_pattern_from);
 
 } // namespace attributes
 
-using PositionOnlyLayoutAttributes = gl::Attributes<attributes::a_pos>;
+using PositionOnlyLayoutAttributes = TypeList<attributes::a_pos>;
 
 } // namespace mbgl