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

[glsl-in] for loops

Browse Source
This commit is contained in:
João Capucho
2021-05-14 17:18:47 +01:00
committed by Dzmitry Malyshau
parent 7165a06fbf
commit 14f2caf6b0
2 changed files with 89 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/front/glsl/parser.rs
View File

@@ -896,6 +896,7 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
let pointer = self.parse_unary(ctx)?;
let start_meta = pointer.meta.clone();
// TODO: More assign symbols
if self.bump_if(TokenValue::Assign).is_some() {
let value = Box::new(self.parse_assignment(ctx)?);
let end_meta = value.meta.clone();
@@ -1131,6 +1132,76 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
continuing: Block::new(),
})
}
TokenValue::For => {
self.bump()?;
ctx.push_scope();
self.expect(TokenValue::LeftParen)?;
if self.bump_if(TokenValue::Semicolon).is_none() {
if self.peek_type_name() || self.peek_type_qualifier() {
self.parse_declaration(ctx, body, false)?;
} else {
self.parse_expression(ctx)?;
self.expect(TokenValue::Semicolon)?;
}
}
let (mut block, mut continuing) = (Block::new(), Block::new());
if self.bump_if(TokenValue::Semicolon).is_none() {
let expr = if self.peek_type_name() || self.peek_type_qualifier() {
let qualifiers = self.parse_type_qualifiers()?;
let ty = self.parse_type_non_void()?;
let name = self.expect_ident()?.0;
self.expect(TokenValue::Assign)?;
let value = self.parse_initializer(ty, ctx, &mut block)?;
let pointer =
self.program
.add_local_var(ctx, &qualifiers, ty, name, None)?;
block.push(Statement::Store { pointer, value });
value
} else {
let root = self.parse_expression(ctx)?;
ctx.lower(self.program, root, false, &mut block)?
};
body.push(Statement::If {
condition: ctx.expressions.append(Expression::Unary {
op: UnaryOperator::Not,
expr,
}),
accept: vec![Statement::Break],
reject: Block::new(),
});
self.expect(TokenValue::Semicolon)?;
}
match self.expect_peek()?.value {
TokenValue::RightParen => {}
_ => {
let rest = self.parse_expression(ctx)?;
ctx.lower(self.program, rest, false, &mut &mut continuing)?;
}
}
self.expect(TokenValue::RightParen)?;
self.parse_statement(ctx, &mut block)?;
body.push(Statement::Loop {
body: block,
continuing,
});
ctx.remove_current_scope();
}
TokenValue::LeftBrace => {
self.bump()?;
@@ -1161,6 +1232,9 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
self.parse_expression(ctx)?;
self.expect(TokenValue::Semicolon)?;
}
TokenValue::Semicolon => {
self.bump()?;
}
_ => {
if self.peek_type_name() || self.peek_type_qualifier() {
self.parse_declaration(ctx, body, false)?;

30
src/front/glsl/parser_tests.rs
View File

@@ -151,21 +151,21 @@ fn control_flow() {
)
.unwrap();
// TODO: Reenable later
// let _program = parse_program(
// r#"
// # version 450
// void main() {
// int x = 0;
// for(int i = 0; i < 10;) {
// x = x + 2;
// }
// return x;
// }
// "#,
// &entry_points,
// )
// .unwrap();
let _program = parse_program(
r#"
# version 450
void main() {
int x = 0;
for(int i = 0; i < 10;) {
x = x + 2;
}
for(;;);
return x;
}
"#,
&entry_points,
)
.unwrap();
}
#[test]