github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for other matrices keywords (#121)

Browse Source 
Add mat2x3, mat2x4, mat3x2, mat3x4, mat4x2, and mat4x3 keywords
This commit is contained in:
Timo de Kort
2020-08-09 15:32:22 +02:00
committed by GitHub
parent 745ef6a6d6
commit 6db5b373f8
1 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/front/wgsl.rs
View File

@@ -1046,6 +1046,33 @@ impl Parser {
width,
}
}
Token::Word("mat2x3") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Bi,
rows: crate::VectorSize::Tri,
kind,
width,
}
}
Token::Word("mat2x4") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Bi,
rows: crate::VectorSize::Quad,
kind,
width,
}
}
Token::Word("mat3x2") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Tri,
rows: crate::VectorSize::Bi,
kind,
width,
}
}
Token::Word("mat3x3") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
@@ -1055,6 +1082,33 @@ impl Parser {
width,
}
}
Token::Word("mat3x4") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Tri,
rows: crate::VectorSize::Quad,
kind,
width,
}
}
Token::Word("mat4x2") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Quad,
rows: crate::VectorSize::Bi,
kind,
width,
}
}
Token::Word("mat4x3") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {
columns: crate::VectorSize::Quad,
rows: crate::VectorSize::Tri,
kind,
width,
}
}
Token::Word("mat4x4") => {
let (kind, width) = lexer.next_scalar_generic()?;
crate::TypeInner::Matrix {