Skip to content

Commit 5d3c2f2

Browse files
committed
WIP Test enabled window transparency
1 parent 56079d3 commit 5d3c2f2

File tree

2 files changed

+43
-39
lines changed

2 files changed

+43
-39
lines changed

wgpu-core/src/device/global.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,44 +1946,44 @@ impl Global {
19461946
available: caps.formats.clone(),
19471947
});
19481948
}
1949-
if !caps
1950-
.composite_alpha_modes
1951-
.contains(&config.composite_alpha_mode)
1952-
{
1953-
let new_alpha_mode = 'alpha: {
1954-
// Automatic alpha mode checks.
1955-
let fallbacks = match config.composite_alpha_mode {
1956-
wgt::CompositeAlphaMode::Auto => &[
1957-
wgt::CompositeAlphaMode::Opaque,
1958-
wgt::CompositeAlphaMode::Inherit,
1959-
][..],
1960-
_ => {
1961-
return Err(E::UnsupportedAlphaMode {
1962-
requested: config.composite_alpha_mode,
1963-
available: caps.composite_alpha_modes.clone(),
1964-
});
1965-
}
1966-
};
1967-
1968-
for &fallback in fallbacks {
1969-
if caps.composite_alpha_modes.contains(&fallback) {
1970-
break 'alpha fallback;
1971-
}
1972-
}
1973-
1974-
unreachable!(
1975-
"Fallback system failed to choose alpha mode. This is a bug. \
1976-
AlphaMode: {:?}, Options: {:?}",
1977-
config.composite_alpha_mode, &caps.composite_alpha_modes
1978-
);
1979-
};
1980-
1981-
api_log!(
1982-
"Automatically choosing alpha mode by rule {:?}. Chose {new_alpha_mode:?}",
1983-
config.composite_alpha_mode
1984-
);
1985-
config.composite_alpha_mode = new_alpha_mode;
1986-
}
1949+
// if !caps
1950+
// .composite_alpha_modes
1951+
// .contains(&config.composite_alpha_mode)
1952+
// {
1953+
// let new_alpha_mode = 'alpha: {
1954+
// // Automatic alpha mode checks.
1955+
// let fallbacks = match config.composite_alpha_mode {
1956+
// wgt::CompositeAlphaMode::Auto => &[
1957+
// wgt::CompositeAlphaMode::Opaque,
1958+
// wgt::CompositeAlphaMode::Inherit,
1959+
// ][..],
1960+
// _ => {
1961+
// return Err(E::UnsupportedAlphaMode {
1962+
// requested: config.composite_alpha_mode,
1963+
// available: caps.composite_alpha_modes.clone(),
1964+
// });
1965+
// }
1966+
// };
1967+
1968+
// for &fallback in fallbacks {
1969+
// if caps.composite_alpha_modes.contains(&fallback) {
1970+
// break 'alpha fallback;
1971+
// }
1972+
// }
1973+
1974+
// unreachable!(
1975+
// "Fallback system failed to choose alpha mode. This is a bug. \
1976+
// AlphaMode: {:?}, Options: {:?}",
1977+
// config.composite_alpha_mode, &caps.composite_alpha_modes
1978+
// );
1979+
// };
1980+
1981+
// api_log!(
1982+
// "Automatically choosing alpha mode by rule {:?}. Chose {new_alpha_mode:?}",
1983+
// config.composite_alpha_mode
1984+
// );
1985+
// config.composite_alpha_mode = new_alpha_mode;
1986+
// }
19871987
if !caps.usage.contains(config.usage) {
19881988
return Err(E::UnsupportedUsage);
19891989
}

wgpu-types/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5408,7 +5408,11 @@ impl Default for SurfaceCapabilities {
54085408
Self {
54095409
formats: Vec::new(),
54105410
present_modes: Vec::new(),
5411-
alpha_modes: vec![CompositeAlphaMode::Opaque],
5411+
alpha_modes: vec![
5412+
CompositeAlphaMode::Opaque,
5413+
CompositeAlphaMode::PreMultiplied,
5414+
CompositeAlphaMode::PostMultiplied
5415+
],
54125416
usages: TextureUsages::RENDER_ATTACHMENT,
54135417
}
54145418
}

0 commit comments

Comments
 (0)