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

[hlsl-out] Fix local variable writing with array type

Browse Source
This commit is contained in:
Gordon-F
2021-07-23 20:47:27 +03:00
committed by Dzmitry Malyshau
parent 7dd9e14a3d
commit 9bd0abb987
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/back/hlsl/writer.rs
View File

@@ -799,6 +799,10 @@ impl<'a, W: Write> Writer<'a, W> {
// The leading space is important
self.write_type(module, local.ty)?;
write!(self.out, " {}", self.names[&func_ctx.name_key(handle)])?;
// Write size for array type
if let TypeInner::Array { size, .. } = module.types[local.ty].inner {
self.write_array_size(module, size)?;
}
write!(self.out, " = ")?;
// Write the local initializer if needed
@@ -1081,12 +1085,11 @@ impl<'a, W: Write> Writer<'a, W> {
match *expression {
Expression::Constant(constant) => self.write_constant(module, constant)?,
Expression::Compose { ty, ref components } => {
let is_struct = if let TypeInner::Struct { .. } = module.types[ty].inner {
true
} else {
false
let braces_init = match module.types[ty].inner {
TypeInner::Struct { .. } | TypeInner::Array { .. } => true,
_ => false,
};
if is_struct {
if braces_init {
write!(self.out, "{{ ")?;
} else {
self.write_type(module, ty)?;
@@ -1100,7 +1103,7 @@ impl<'a, W: Write> Writer<'a, W> {
write!(self.out, ", ")?;
}
}
if is_struct {
if braces_init {
write!(self.out, " }}")?
} else {
write!(self.out, ")")?