mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 22:11:01 +01:00
[wgsl-out] Rewrite indent logic. Reduce heap allocation
This commit is contained in:
1 parent
c4f3f5ca72
commit
317d11af56
1 file changed
+40
-37
+40
-37
@@ -277,7 +277,7 @@ impl<W: Write> Writer<W> {
|
||||
// Write the function body (statement list)
|
||||
for sta in func.body.iter() {
|
||||
// The indentation should always be 1 when writing the function body
|
||||
self.write_stmt(module, sta, func_ctx, 1)?;
|
||||
self.write_stmt(module, sta, func_ctx, back::Level(1))?;
|
||||
}
|
||||
|
||||
writeln!(self.out, "}}")?;
|
||||
@@ -563,10 +563,9 @@ impl<W: Write> Writer<W> {
|
||||
module: &Module,
|
||||
stmt: &crate::Statement,
|
||||
func_ctx: &back::FunctionCtx<'_>,
|
||||
indent: usize,
|
||||
level: back::Level,
|
||||
) -> BackendResult {
|
||||
use crate::{Expression, Statement};
|
||||
use back::INDENT;
|
||||
|
||||
match *stmt {
|
||||
Statement::Emit(ref range) => {
|
||||
@@ -612,7 +611,7 @@ impl<W: Write> Writer<W> {
|
||||
};
|
||||
|
||||
if let Some(name) = expr_name {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
self.start_named_expr(module, handle, func_ctx, &name)?;
|
||||
self.write_expr(module, handle, func_ctx)?;
|
||||
self.named_expressions.insert(handle, name);
|
||||
@@ -626,31 +625,32 @@ impl<W: Write> Writer<W> {
|
||||
ref accept,
|
||||
ref reject,
|
||||
} => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
write!(self.out, "if (")?;
|
||||
self.write_expr(module, condition, func_ctx)?;
|
||||
writeln!(self.out, ") {{")?;
|
||||
|
||||
let l2 = level.next();
|
||||
for sta in accept {
|
||||
// Increase indentation to help with readability
|
||||
self.write_stmt(module, sta, func_ctx, indent + 1)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2)?;
|
||||
}
|
||||
|
||||
// If there are no statements in the reject block we skip writing it
|
||||
// This is only for readability
|
||||
if !reject.is_empty() {
|
||||
writeln!(self.out, "{}}} else {{", INDENT.repeat(indent))?;
|
||||
writeln!(self.out, "{}}} else {{", level)?;
|
||||
|
||||
for sta in reject {
|
||||
// Increase indentation to help with readability
|
||||
self.write_stmt(module, sta, func_ctx, indent + 1)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2)?;
|
||||
}
|
||||
}
|
||||
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent))?
|
||||
writeln!(self.out, "{}}}", level)?
|
||||
}
|
||||
Statement::Return { value } => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
write!(self.out, "return")?;
|
||||
if let Some(return_value) = value {
|
||||
// The leading space is important
|
||||
@@ -661,7 +661,7 @@ impl<W: Write> Writer<W> {
|
||||
}
|
||||
// TODO: copy-paste from glsl-out
|
||||
Statement::Kill => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
writeln!(self.out, "discard;")?
|
||||
}
|
||||
Statement::Store { pointer, value } => {
|
||||
@@ -673,7 +673,7 @@ impl<W: Write> Writer<W> {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
|
||||
let (is_ptr, is_atomic) = match *func_ctx.info[pointer].ty.inner_with(&module.types)
|
||||
{
|
||||
@@ -707,7 +707,7 @@ impl<W: Write> Writer<W> {
|
||||
ref arguments,
|
||||
result,
|
||||
} => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
if let Some(expr) = result {
|
||||
let name = format!("{}{}", back::BAKE_PREFIX, expr.index());
|
||||
self.start_named_expr(module, expr, func_ctx, &name)?;
|
||||
@@ -731,7 +731,7 @@ impl<W: Write> Writer<W> {
|
||||
value,
|
||||
result,
|
||||
} => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
let res_name = format!("{}{}", back::BAKE_PREFIX, result.index());
|
||||
self.start_named_expr(module, result, func_ctx, &res_name)?;
|
||||
self.named_expressions.insert(result, res_name);
|
||||
@@ -758,7 +758,7 @@ impl<W: Write> Writer<W> {
|
||||
array_index,
|
||||
value,
|
||||
} => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
write!(self.out, "textureStore(")?;
|
||||
self.write_expr(module, image, func_ctx)?;
|
||||
write!(self.out, ", ")?;
|
||||
@@ -773,13 +773,13 @@ impl<W: Write> Writer<W> {
|
||||
}
|
||||
// TODO: copy-paste from glsl-out
|
||||
Statement::Block(ref block) => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
writeln!(self.out, "{{")?;
|
||||
for sta in block.iter() {
|
||||
// Increase the indentation to help with readability
|
||||
self.write_stmt(module, sta, func_ctx, indent + 1)?
|
||||
self.write_stmt(module, sta, func_ctx, level.next())?
|
||||
}
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent))?
|
||||
writeln!(self.out, "{}}}", level)?
|
||||
}
|
||||
Statement::Switch {
|
||||
selector,
|
||||
@@ -787,7 +787,7 @@ impl<W: Write> Writer<W> {
|
||||
ref default,
|
||||
} => {
|
||||
// Start the switch
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
write!(self.out, "switch(")?;
|
||||
self.write_expr(module, selector, func_ctx)?;
|
||||
writeln!(self.out, ") {{")?;
|
||||
@@ -797,10 +797,12 @@ impl<W: Write> Writer<W> {
|
||||
let all_fall_through = cases
|
||||
.iter()
|
||||
.all(|case| case.fall_through && case.body.is_empty());
|
||||
|
||||
let l2 = level.next();
|
||||
if !cases.is_empty() {
|
||||
for case in cases {
|
||||
if write_case {
|
||||
write!(self.out, "{}case ", INDENT.repeat(indent + 1))?;
|
||||
write!(self.out, "{}case ", l2)?;
|
||||
}
|
||||
if !all_fall_through && case.fall_through && case.body.is_empty() {
|
||||
write_case = false;
|
||||
@@ -812,63 +814,64 @@ impl<W: Write> Writer<W> {
|
||||
}
|
||||
|
||||
for sta in case.body.iter() {
|
||||
self.write_stmt(module, sta, func_ctx, indent + 2)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2.next())?;
|
||||
}
|
||||
|
||||
if case.fall_through {
|
||||
writeln!(self.out, "{}fallthrough;", INDENT.repeat(indent + 2))?;
|
||||
writeln!(self.out, "{}fallthrough;", l2.next())?;
|
||||
}
|
||||
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent + 1))?;
|
||||
writeln!(self.out, "{}}}", l2)?;
|
||||
}
|
||||
}
|
||||
|
||||
if !default.is_empty() {
|
||||
writeln!(self.out, "{}default: {{", INDENT.repeat(indent + 1))?;
|
||||
writeln!(self.out, "{}default: {{", l2)?;
|
||||
|
||||
for sta in default {
|
||||
self.write_stmt(module, sta, func_ctx, indent + 2)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2.next())?;
|
||||
}
|
||||
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent + 1))?
|
||||
writeln!(self.out, "{}}}", l2)?
|
||||
}
|
||||
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent))?
|
||||
writeln!(self.out, "{}}}", level)?
|
||||
}
|
||||
Statement::Loop {
|
||||
ref body,
|
||||
ref continuing,
|
||||
} => {
|
||||
write!(self.out, "{}", INDENT.repeat(indent))?;
|
||||
write!(self.out, "{}", level)?;
|
||||
writeln!(self.out, "loop {{")?;
|
||||
|
||||
let l2 = level.next();
|
||||
for sta in body.iter() {
|
||||
self.write_stmt(module, sta, func_ctx, indent + 1)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2)?;
|
||||
}
|
||||
|
||||
if !continuing.is_empty() {
|
||||
writeln!(self.out, "{}continuing {{", INDENT.repeat(indent + 1))?;
|
||||
writeln!(self.out, "{}continuing {{", l2)?;
|
||||
for sta in continuing.iter() {
|
||||
self.write_stmt(module, sta, func_ctx, indent + 2)?;
|
||||
self.write_stmt(module, sta, func_ctx, l2.next())?;
|
||||
}
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent + 1))?;
|
||||
writeln!(self.out, "{}}}", l2)?;
|
||||
}
|
||||
|
||||
writeln!(self.out, "{}}}", INDENT.repeat(indent))?
|
||||
writeln!(self.out, "{}}}", level)?
|
||||
}
|
||||
Statement::Break => {
|
||||
writeln!(self.out, "{}break;", INDENT.repeat(indent))?;
|
||||
writeln!(self.out, "{}break;", level)?;
|
||||
}
|
||||
Statement::Continue => {
|
||||
writeln!(self.out, "{}continue;", INDENT.repeat(indent))?;
|
||||
writeln!(self.out, "{}continue;", level)?;
|
||||
}
|
||||
Statement::Barrier(barrier) => {
|
||||
if barrier.contains(crate::Barrier::STORAGE) {
|
||||
writeln!(self.out, "{}storageBarrier();", INDENT.repeat(indent))?;
|
||||
writeln!(self.out, "{}storageBarrier();", level)?;
|
||||
}
|
||||
|
||||
if barrier.contains(crate::Barrier::WORK_GROUP) {
|
||||
writeln!(self.out, "{}workgroupBarrier();", INDENT.repeat(indent))?;
|
||||
writeln!(self.out, "{}workgroupBarrier();", level)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user