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-new] disable constant expression (#131)

Browse Source
This commit is contained in:
Pelle Johnsen
2020-08-17 15:37:11 +02:00
committed by GitHub
parent 50cd2b1bc2
commit 34cf97cb91
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/front/glsl_new/parser.rs
View File

@@ -439,13 +439,14 @@ pomelo! {
}
}
constant_expression ::= conditional_expression(e) {
if let Expression::Constant(h) = extra.context.expressions[e] {
h
} else {
return Err(ErrorKind::ExpectedConstant)
}
}
//TODO: properly handle constant expressions
// constant_expression ::= conditional_expression(e) {
// if let Expression::Constant(h) = extra.context.expressions[e] {
// h
// } else {
// return Err(ErrorKind::ExpectedConstant)
// }
// }
// declaration
declaration ::= init_declarator_list(idl) Semicolon {idl}
@@ -502,13 +503,10 @@ pomelo! {
l
}
// layout_qualifier_id ::= Identifier;
layout_qualifier_id ::= Identifier(i) Equal constant_expression(c) {
//TODO: handle full constant_expression instead of IntConstant
layout_qualifier_id ::= Identifier(i) Equal IntConstant(ic) {
if i.1.as_str() == "location" {
if let ConstantInner::Sint(loc) = extra.constants[c].inner {
Binding::Location(loc as u32)
} else {
return Err(ErrorKind::NotImplemented("location not Sint"));
}
Binding::Location(ic.1 as u32)
} else {
return Err(ErrorKind::NotImplemented("non location layout qualifier"));
}