From 31a5fe41686fcdd00c9012e62b4274bb4d49682a Mon Sep 17 00:00:00 2001
From: David McGillicuddy <david.mcgillicuddy@moneyfarm.com>
Date: Sun, 20 Nov 2016 22:07:19 +0000
Subject: [PATCH 1/2] Add attributes to gfx_defines macros

For this commit, it only works on the `vertex` and `constant` structs, and NOT any of their fields.
---
 src/render/src/macros/mod.rs       | 31 ++++++++++++++++++++---
 src/render/src/macros/structure.rs | 40 ++++++++++++++++++++++++++++--
 tests/macros.rs                    |  5 ++++
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/render/src/macros/mod.rs b/src/render/src/macros/mod.rs
index fd7c9090346..89549689a09 100644
--- a/src/render/src/macros/mod.rs
+++ b/src/render/src/macros/mod.rs
@@ -34,16 +34,16 @@ macro_rules! gfx_format {
 /// Defines vertex, constant and pipeline formats in one block
 #[macro_export]
 macro_rules! gfx_defines {
-    (vertex $name:ident {
+    ($(#[$attr:meta])* vertex $name:ident {
             $( $field:ident : $ty:ty = $e:expr, )+
     }) => {
-        gfx_vertex_struct!($name {$($field:$ty = $e,)+});
+        gfx_vertex_struct_meta!($(#[$attr])* vertex_struct_meta $name {$($field:$ty = $e,)+});
     };
 
-    (constant $name:ident {
+    ($(#[$attr:meta])* constant $name:ident {
             $( $field:ident : $ty:ty = $e:expr, )+
     }) => {
-        gfx_constant_struct!($name {$($field:$ty = $e,)+});
+        gfx_constant_struct_meta!($(#[$attr])* constant_struct_meta $name {$($field:$ty = $e,)+});
     };
 
     (pipeline $name:ident {
@@ -52,6 +52,29 @@ macro_rules! gfx_defines {
         gfx_pipeline!($name {$($field:$ty = $e,)+});
     };
 
+    // The recursive case for vertex structs
+    ($(#[$attr:meta])* vertex $name:ident {
+            $( $field:ident : $ty:ty = $e:expr, )+
+    } $($tail:tt)+) => {
+        gfx_defines! {
+            $(#[$attr])*
+            vertex $name { $($field : $ty = $e,)+ }
+        }
+        gfx_defines!($($tail)+);
+    };
+
+    // The recursive case for constant structs
+    ($(#[$attr:meta])* constant $name:ident {
+            $( $field:ident : $ty:ty = $e:expr, )+
+    } $($tail:tt)+) => {
+        gfx_defines! {
+            $(#[$attr])*
+            constant $name { $($field : $ty = $e,)+ }
+        }
+        gfx_defines!($($tail)+);
+    };
+
+    // The recursive case for the other keywords
     ($keyword:ident $name:ident {
             $( $field:ident : $ty:ty = $e:expr, )+
     } $($tail:tt)+) => {
diff --git a/src/render/src/macros/structure.rs b/src/render/src/macros/structure.rs
index d727311c2ed..299e917adfe 100644
--- a/src/render/src/macros/structure.rs
+++ b/src/render/src/macros/structure.rs
@@ -18,8 +18,20 @@
 macro_rules! gfx_impl_struct {
     ($runtime_format:ty : $compile_format:path = $root:ident {
         $( $field:ident: $ty:ty = $name:expr, )*
+    }) => (gfx_impl_struct_meta! {
+        impl_struct_meta $runtime_format : $compile_format = $root {
+            $( $field : $ty = $name, )*
+        }
+    })
+}
+
+#[macro_export]
+macro_rules! gfx_impl_struct_meta {
+    ($(#[$attr:meta])* impl_struct_meta $runtime_format:ty : $compile_format:path = $root:ident {
+        $( $field:ident: $ty:ty = $name:expr, )*
     }) => {
         #[derive(Clone, Copy, Debug)]
+        $(#[$attr])*
         pub struct $root {
             $( pub $field: $ty, )*
         }
@@ -66,7 +78,19 @@ macro_rules! gfx_impl_struct {
 macro_rules! gfx_vertex_struct {
     ($root:ident {
         $( $field:ident: $ty:ty = $name:expr, )*
-    }) => (gfx_impl_struct!{
+    }) => (gfx_vertex_struct_meta! {
+        vertex_struct_meta $root {
+            $( $field : $ty = $name, )*
+        }
+    })
+}
+
+#[macro_export]
+macro_rules! gfx_vertex_struct_meta {
+    ($(#[$attr:meta])* vertex_struct_meta $root:ident {
+        $( $field:ident: $ty:ty = $name:expr, )*
+    }) => (gfx_impl_struct_meta!{
+        $(#[$attr])* impl_struct_meta
         $crate::format::Format : $crate::format::Formatted =
         $root {
             $( $field: $ty = $name, )*
@@ -78,7 +102,19 @@ macro_rules! gfx_vertex_struct {
 macro_rules! gfx_constant_struct {
     ($root:ident {
         $( $field:ident: $ty:ty = $name:expr, )*
-    }) => (gfx_impl_struct!{
+    }) => (gfx_constant_struct_meta!{
+        constant_struct_meta $root {
+            $( $field : $ty = $name, )*
+        }
+    })
+}
+
+#[macro_export]
+macro_rules! gfx_constant_struct_meta {
+    ($(#[$attr:meta])* constant_struct_meta $root:ident {
+        $( $field:ident: $ty:ty = $name:expr, )*
+    }) => (gfx_impl_struct_meta!{
+        $(#[$attr])* impl_struct_meta
         $crate::shade::ConstFormat : $crate::shade::Formatted =
         $root {
             $( $field: $ty = $name, )*
diff --git a/tests/macros.rs b/tests/macros.rs
index c1620f9bd0d..a01325ed29e 100644
--- a/tests/macros.rs
+++ b/tests/macros.rs
@@ -7,6 +7,7 @@ pub struct Rg16;
 gfx_format!(Rg16: R16_G16 = Vec2<Float>);
 
 gfx_defines!{
+    #[derive(PartialEq)]
     vertex Vertex {
         _x: i8 = "x",
         _y: f32 = "y",
@@ -20,6 +21,10 @@ gfx_defines!{
     constant Local {
         pos: [u32; 4] = "pos",
     }
+    #[derive(PartialEq)] #[derive(PartialOrd)]
+    constant LocalMeta {
+        pos: [u32; 4] = "pos_meta",
+    }
     
     pipeline testpipe {
         vertex: gfx::VertexBuffer<Vertex> = (),

From 6f7942575188a62ed866fda8ad9b1464ad3fb848 Mon Sep 17 00:00:00 2001
From: David McGillicuddy <david.mcgillicuddy@moneyfarm.com>
Date: Mon, 21 Nov 2016 07:21:42 +0000
Subject: [PATCH 2/2] Remove logic for fields without trailing commas.

---
 src/render/src/macros/mod.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/render/src/macros/mod.rs b/src/render/src/macros/mod.rs
index 89549689a09..6b5fe344e07 100644
--- a/src/render/src/macros/mod.rs
+++ b/src/render/src/macros/mod.rs
@@ -83,14 +83,4 @@ macro_rules! gfx_defines {
         }
         gfx_defines!($($tail)+);
     };
-
-    ($keyword:ident $name:ident {
-            $( $field:ident : $ty:ty = $e:expr ),*
-    }) => {
-        gfx_defines! {
-            $keyword $name {
-                $($field : $ty = $e ,)*
-            }
-        }
-    };
 }