[gles] fix duplicated surface compat format computation

disable f16 for webgl for now again
gfx-rs · Oct 7, 2022 · 89f1315 · 89f1315
1 parent 53fc8ed
commit 89f1315
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/wgpu-hal/src/gles/adapter.rs b/wgpu-hal/src/gles/adapter.rs
@@ -786,26 +786,6 @@ impl crate::Adapter<super::Api> for super::Adapter {
  &self,
  surface: &super::Surface,
  ) -> Option<crate::SurfaceCapabilities> {
- let mut formats = if surface.supports_srgb() {
- vec![
- wgt::TextureFormat::Rgba8UnormSrgb,
- #[cfg(not(target_arch = "wasm32"))]
- wgt::TextureFormat::Bgra8UnormSrgb,
- ]
- } else {
- vec![
- wgt::TextureFormat::Rgba8Unorm,
- #[cfg(not(target_arch = "wasm32"))]
- wgt::TextureFormat::Bgra8Unorm,
- ]
- };
- if self
- .shared
- .private_caps
- .contains(super::PrivateCapabilities::COLOR_BUFFER_HALF_FLOAT)
- {
- formats.push(wgt::TextureFormat::Rgba16Float)
- }
  if surface.presentable {
  let mut formats = vec![
  wgt::TextureFormat::Rgba8Unorm,
@@ -819,6 +799,14 @@ impl crate::Adapter<super::Api> for super::Adapter {
  wgt::TextureFormat::Bgra8UnormSrgb,
  ])
  }
+ #[cfg(not(target_arch = "wasm32"))]
+ if self
+ .shared
+ .private_caps
+ .contains(super::PrivateCapabilities::COLOR_BUFFER_HALF_FLOAT)
+ {
+ formats.push(wgt::TextureFormat::Rgba16Float)
+ }
 
  Some(crate::SurfaceCapabilities {
  formats,