[rs] replace vertex_format_size macro with VertexFormat size function
@@ -24,109 +24,12 @@ macro_rules! vertex_attr_array {
offset: $off,
shader_location: $loc,
},];
- $off + $crate::vertex_format_size!($item);
+ $off + $crate::VertexFormat :: $item.size();
$($ll => $ii ,)*
)
};
}
-/// Helper macro which turns a vertex attribute type into a size.
-///
-/// Mainly used as a helper for [`vertex_attr_array`] but might be externally useful.
-#[macro_export]
-macro_rules! vertex_format_size {
- (Uchar2) => {
- 2
- };
- (Uchar4) => {
- 4
- };
- (Char2) => {
- 2
- };
- (Char4) => {
- 4
- };
- (Uchar2Norm) => {
- 2
- };
- (Uchar4Norm) => {
- 4
- };
- (Char2Norm) => {
- 2
- };
- (Char4Norm) => {
- 4
- };
- (Ushort2) => {
- 4
- };
- (Ushort4) => {
- 8
- };
- (Short2) => {
- 4
- };
- (Short4) => {
- 8
- };
- (Ushort2Norm) => {
- 4
- };
- (Ushort4Norm) => {
- 8
- };
- (Short2Norm) => {
- 4
- };
- (Short4Norm) => {
- 8
- };
- (Half2) => {
- 4
- };
- (Half4) => {
- 8
- };
- (Float) => {
- 4
- };
- (Float2) => {
- 8
- };
- (Float3) => {
- 12
- };
- (Float4) => {
- 16
- };
- (Uint) => {
- 4
- };
- (Uint2) => {
- 8
- };
- (Uint3) => {
- 12
- };
- (Uint4) => {
- 16
- };
- (Int) => {
- 4
- };
- (Int2) => {
- 8
- };
- (Int3) => {
- 12
- };
- (Int4) => {
- 16
- };
-}
-
#[test]
fn test_vertex_attr_array() {
let attrs = vertex_attr_array![0 => Float2, 3 => Ushort4];
