Add attributes to gfx_defines macros #1080
Conversation
For this commit, it only works on the `vertex` and `constant` structs, and NOT any of their fields.
|
This is a workaround for the issue rust-lang/rust#24189 which causes the character '#' to be considered a valid identifier character. Thus, the macro pattern (which is greedy with no lookahead) fails because the parse is ambiguous. So whenever we want a pattern like this, there needs to be something separating the two tokens. Lazy static uses commas: https://github.com/rust-lang-nursery/lazy-static.rs/blob/v0.2.1/src/lib.rs This commit uses the "keywords" |
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! gfx_impl_struct_meta { |
There was a problem hiding this comment.
any reason you decided to not just put the extra stuff into gfx_impl_struct instead of routing through the new gfx_impl_struct_meta?
There was a problem hiding this comment.
Backwards compatibility in case anybody called gfx_impl_struct directly.
There was a problem hiding this comment.
I could probably have two patterns inside gfx_impl_struct, one with $(#[$attr:meta])* impl_struct_meta and one without, but then I believe I'd have to duplicate the whole body, which is worse to me than having an extra name.
| @@ -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 { | |||
There was a problem hiding this comment.
is this ever going to hit, given that the same pattern is parsed above?
There was a problem hiding this comment.
This pattern contains $($tail:tt)+, it's the recursive case. The above pattern only matches for a single struct.
|
📌 Commit 6f79425 has been approved by |
Add attributes to gfx_defines macros For this commit, it only works on the `vertex` and `constant` structs, and NOT any of their fields.
|
⚡ Test exempted - status |
1080: Fix the validation of vertex buffer sizes r=kvark a=JCapucho **Connections** None that i know of **Description** ~~The vertex buffer size (in vertices) was being divided by stride causing the limit to be lower than it was supposed to be.~~ This bug wasn't triggered earlier because if the stride was 0 it wouldn't perform any calculation and the stride was only set when a set pipeline command was received and the `VertexState` `inputs` were already created so the following commands would work: ``` SetPipeline with 1 vertex buffer SetVertexBuffer with only 4 vertices Draw 6 vertices ``` This would have passed validation while this wouldn't ``` SetPipeline with 1 vertex buffer of stride 8 SetVertexBuffer with 4 vertices SetPipeline with 1 vertex buffer of stride 8 SetVertexBuffer with 4 vertices Draw 3 vertices ``` Now all draw calls have proper vertex validation and not only after the `inputs` are populated **Testing** This change was tested after debugging an issue with the draw calls failing in a specific order in [veloren](https://gitlab.com/veloren/veloren/-/tree/imbris/wgpu-master-rebased) Co-authored-by: Capucho <jcapucho7@gmail.com>
For this commit, it only works on the
vertexandconstantstructs, and NOT any of their fields.