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

[wgsl-out] Improve texture sampling call

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-05-28 22:32:50 -04:00
committed by Dzmitry Malyshau
parent 8a1d883ba5
commit d3fbb30d46
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/back/wgsl/writer.rs
View File

@@ -960,18 +960,18 @@ impl<W: Write> Writer<W> {
level,
depth_ref,
} => {
let texture_function = if depth_ref.is_some() {
"textureSampleCompare"
} else {
match level {
SampleLevel::Auto | SampleLevel::Zero => "textureSample",
SampleLevel::Exact(_) => "textureSampleLevel",
SampleLevel::Bias(_) => "textureSampleBias",
SampleLevel::Gradient { .. } => "textureSampleGrad",
}
let suffix_cmp = match depth_ref {
Some(_) => "Compare",
None => "",
};
let suffix_level = match level {
SampleLevel::Auto => "",
SampleLevel::Zero | SampleLevel::Exact(_) => "Level",
SampleLevel::Bias(_) => "Bias",
SampleLevel::Gradient { .. } => "Grad",
};
write!(self.out, "{}(", texture_function)?;
write!(self.out, "textureSample{}{}(", suffix_cmp, suffix_level)?;
self.write_expr(module, image, func_ctx)?;
write!(self.out, ", ")?;
self.write_expr(module, sampler, func_ctx)?;
@@ -983,26 +983,33 @@ impl<W: Write> Writer<W> {
self.write_expr(module, array_index, func_ctx)?;
}
if let SampleLevel::Bias(expr) = level {
write!(self.out, ", ")?;
self.write_expr(module, expr, func_ctx)?;
}
if let Some(depth_ref) = depth_ref {
write!(self.out, ", ")?;
self.write_expr(module, depth_ref, func_ctx)?;
}
if let SampleLevel::Gradient { x, y } = level {
write!(self.out, ", ")?;
self.write_expr(module, x, func_ctx)?;
write!(self.out, ", ")?;
self.write_expr(module, y, func_ctx)?;
}
if let SampleLevel::Exact(expr) = level {
write!(self.out, ", ")?;
self.write_expr(module, expr, func_ctx)?;
match level {
SampleLevel::Auto => {}
SampleLevel::Zero => {
// Level 0 is implied for depth comparison
if depth_ref.is_none() {
write!(self.out, ", 0.0")?;
}
}
SampleLevel::Exact(expr) => {
write!(self.out, ", ")?;
self.write_expr(module, expr, func_ctx)?;
}
SampleLevel::Bias(expr) => {
write!(self.out, ", ")?;
self.write_expr(module, expr, func_ctx)?;
}
SampleLevel::Gradient { x, y } => {
write!(self.out, ", ")?;
self.write_expr(module, x, func_ctx)?;
write!(self.out, ", ")?;
self.write_expr(module, y, func_ctx)?;
}
}
if let Some(offset) = offset {

2
tests/out/shadow.wgsl
View File

@@ -30,7 +30,7 @@ fn fetch_shadow(light_id: u32, homogeneous_coords: vec4<f32>) -> f32 {
if ((homogeneous_coords.w <= 0.0)) {
return 1.0;
}
let _e26: f32 = textureSampleCompare(t_shadow, sampler_shadow, (((homogeneous_coords.xy * vec2<f32>(0.5, -0.5)) / vec2<f32>(homogeneous_coords.w)) + vec2<f32>(0.5, 0.5)), i32(light_id), (homogeneous_coords.z / homogeneous_coords.w));
let _e26: f32 = textureSampleCompareLevel(t_shadow, sampler_shadow, (((homogeneous_coords.xy * vec2<f32>(0.5, -0.5)) / vec2<f32>(homogeneous_coords.w)) + vec2<f32>(0.5, 0.5)), i32(light_id), (homogeneous_coords.z / homogeneous_coords.w));
return _e26;
}