@@ -399,19 +399,19 @@ either

 -   `T` itself, if `T` is a [scalar][]

 then `constexpr auto GLTraits::members<T>()` returns an instance of the

-[empty][] `struct GLTraits::Members<typename... Values>` where `Values...` are

-the ("member") types above, in the order they occur in `T`.

+[empty][] `struct GLTraits::Members<typename T, typename... Values>` where

+`Values...` are the ("member") types above, in the order they occur in `T`.

 An example use case would be along the lines of:

 ```cpp

 template<

+    typename    T,

     typename    Value,

     typename... Values

 >

 void vertex_setup(

-    GLTraits::Members<Value, Values...>,

-    std::size_t stride,

+    GLTraits::Members<T, Value, Values...>,

     std::size_t offset   = 0,

     GLint       location = 0

 )

@@ -419,15 +419,15 @@ void vertex_setup(

     auto unaligned = offset % alignof(Value);

     if (unaligned)

         offset += alignof(Value) - unaligned;

-    GLTraits::Value<Value>::vertex_attrib_pointer(location, offset, stride);

+    GLTraits::Value<Value>::vertex_attrib_pointer(location, offset, sizeof(T));

     vertex_setup(

-        GLTraits::Members<Values...>{},

-        stride,

+        GLTraits::Members<T, Values...>{},

         offset   + sizeof(Value),

         location + GLTraits::Value<Value>::columns

     );

 }

-void vertex_setup(GLTraits::Members<>, std::size_t, std::size_t, GLint)

+template<typename T>

+void vertex_setup(GLTraits::Members<T>, std::size_t, GLint)

 {}

 struct Vertex

@@ -440,7 +440,7 @@ struct Vertex

     GLubyte    flags;

     GLdouble   unaligned;

 };

-vertex_setup(GLTraits::members<Vertex>(), sizeof(Vertex));

+vertex_setup(GLTraits::members<Vertex>());

 ```

 This use case is tested in [`tests/vertex_setup.cpp`][]. To verify that the

@@ -42,7 +42,7 @@ public:

     #if __cplusplus >= 201402L

-    template<typename... Value>

+    template<typename T, typename... Value>

     struct Members

     {};

@@ -153,6 +153,7 @@ private:

     static constexpr auto members_(Indices<Is...>)

     {

         return Members<

+            T,

             typename ValueID<member_infos<T, Is...>().infos[Is].id>::Value...

         >{};

     }

@@ -111,11 +111,12 @@ struct GLTraitsTest : protected GLBase

     #if __cplusplus >= 201402L

     template<

+        typename    T,

         typename    Value,

         typename... Values

     >

     void static test_members(

-        GLTraits::Members<Value, Values...>,

+        GLTraits::Members<T, Value, Values...>,

         std::size_t offset = 0

     )

     {

@@ -126,7 +127,7 @@ struct GLTraitsTest : protected GLBase

         using Traits = GLTraits::Value<Value>;

         static_assert(

             std::is_empty<GLTraits::Members<

-                Value, Values...

+                T, Value, Values...

             >>::value,

             "GLTraits::Members must be empty"

         );

@@ -137,9 +138,10 @@ struct GLTraitsTest : protected GLBase

                 << std::right << std::setw(2) << std::dec << OFFSET << " " \

                 << std::right << std::setw(3) << std::dec << END    << "\n";

         GLTRAITS_TEST_MEMBERS(2, Traits::name, offset, end)

-        test_members(GLTraits::Members<Values...>{}, end);

+        test_members(GLTraits::Members<T, Values...>{}, end);

     }

-    void static test_members(GLTraits::Members<>, std::size_t)

+    template<typename T>

+    void static test_members(GLTraits::Members<T>, std::size_t)

     {}

     #endif

@@ -7,12 +7,12 @@

 template<

+    typename    T,

     typename    Value,

     typename... Values

 >

 void vertex_setup(

-    GLTraits::Members<Value, Values...>,

-    std::size_t stride,

+    GLTraits::Members<T, Value, Values...>,

     std::size_t offset   = 0,

     GLint       location = 0

 )

@@ -20,15 +20,15 @@ void vertex_setup(

     auto unaligned = offset % alignof(Value);

     if (unaligned)

         offset += alignof(Value) - unaligned;

-    GLTraits::Value<Value>::vertex_attrib_pointer(location, offset, stride);

+    GLTraits::Value<Value>::vertex_attrib_pointer(location, offset, sizeof(T));

     vertex_setup(

-        GLTraits::Members<Values...>{},

-        stride,

+        GLTraits::Members<T, Values...>{},

         offset   + sizeof(Value),

         location + GLTraits::Value<Value>::columns

     );

 }

-void vertex_setup(GLTraits::Members<>, std::size_t, std::size_t, GLint)

+template<typename T>

+void vertex_setup(GLTraits::Members<T>, std::size_t, GLint)

 {}

@@ -44,5 +44,5 @@ int main()

         GLubyte    flags;

         GLdouble   unaligned;

     };

-    vertex_setup(GLTraits::members<Vertex>(), sizeof(Vertex));

+    vertex_setup(GLTraits::members<Vertex>());

 }