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] Fix emitting issues

Browse Source
This commit is contained in:
João Capucho
2021-06-01 19:21:49 +01:00
committed by Dzmitry Malyshau
parent 027634451d
commit 679b6a308f
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/front/glsl/ast.rs
View File

@@ -204,8 +204,6 @@ impl<'function> Context<'function> {
emitter: Emitter::default(),
};
this.emit_start();
for &(ref name, handle) in program.constants.iter() {
let expr = this.expressions.append(Expression::Constant(handle));
let var = VariableReference {
@@ -218,24 +216,32 @@ impl<'function> Context<'function> {
this.lookup_global_var_exps.insert(name.into(), var);
}
this.emit_start();
for &(ref name, lookup) in program.global_variables.iter() {
this.emit_flush(body);
let GlobalLookup { kind, entry_arg } = lookup;
let (expr, load) = match kind {
GlobalLookupKind::Variable(v) => (
Expression::GlobalVariable(v),
program.module.global_variables[v].class != StorageClass::Handle,
),
GlobalLookupKind::Variable(v) => {
let res = (
this.expressions.append(Expression::GlobalVariable(v)),
program.module.global_variables[v].class != StorageClass::Handle,
);
this.emit_start();
res
}
GlobalLookupKind::BlockSelect(handle, index) => {
let base = this.expressions.append(Expression::GlobalVariable(handle));
this.emit_start();
let expr = this
.expressions
.append(Expression::AccessIndex { base, index });
(Expression::AccessIndex { base, index }, true)
(expr, true)
}
};
let expr = this.expressions.append(expr);
this.emit_start();
let var = VariableReference {
expr,
load: if load {