diff --git a/wgpu-core/src/conv.rs b/wgpu-core/src/conv.rs index 43986c946..75a97eb08 100644 --- a/wgpu-core/src/conv.rs +++ b/wgpu-core/src/conv.rs @@ -131,6 +131,31 @@ pub fn map_texture_usage( u } +pub fn map_texture_usage_from_hal(uses: hal::TextureUses) -> wgt::TextureUsages { + let mut u = wgt::TextureUsages::empty(); + u.set( + wgt::TextureUsages::COPY_SRC, + uses.contains(hal::TextureUses::COPY_SRC), + ); + u.set( + wgt::TextureUsages::COPY_DST, + uses.contains(hal::TextureUses::COPY_DST), + ); + u.set( + wgt::TextureUsages::TEXTURE_BINDING, + uses.contains(hal::TextureUses::RESOURCE), + ); + u.set( + wgt::TextureUsages::STORAGE_BINDING, + uses.contains(hal::TextureUses::STORAGE_READ | hal::TextureUses::STORAGE_READ_WRITE), + ); + u.set( + wgt::TextureUsages::RENDER_ATTACHMENT, + uses.contains(hal::TextureUses::COLOR_TARGET), + ); + u +} + pub fn check_texture_dimension_size( dimension: wgt::TextureDimension, wgt::Extent3d { diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs index ff21ca085..3f22459b3 100644 --- a/wgpu-core/src/device/global.rs +++ b/wgpu-core/src/device/global.rs @@ -58,10 +58,13 @@ impl Global { hal_caps.formats.sort_by_key(|f| !f.is_srgb()); + let usages = conv::map_texture_usage_from_hal(hal_caps.usage); + Ok(wgt::SurfaceCapabilities { formats: hal_caps.formats, present_modes: hal_caps.present_modes, alpha_modes: hal_caps.composite_alpha_modes, + usages, }) }) } diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs index 5532c8a80..abe28d620 100644 --- a/wgpu-types/src/lib.rs +++ b/wgpu-types/src/lib.rs @@ -4586,6 +4586,10 @@ pub struct SurfaceCapabilities { /// /// Will return at least one element, CompositeAlphaMode::Opaque or CompositeAlphaMode::Inherit. pub alpha_modes: Vec, + /// Bitflag of supported texture usages for the surface to use with the given adapter. + /// + /// The usage TextureUsages::RENDER_ATTACHMENT is guaranteed. + pub usages: TextureUsages, } impl Default for SurfaceCapabilities { @@ -4594,6 +4598,7 @@ impl Default for SurfaceCapabilities { formats: Vec::new(), present_modes: Vec::new(), alpha_modes: vec![CompositeAlphaMode::Opaque], + usages: TextureUsages::RENDER_ATTACHMENT, } } } diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index be5f79829..104504174 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -1165,6 +1165,8 @@ impl crate::context::Context for Context { // Doesn't really have meaning on the web. present_modes: vec![wgt::PresentMode::Fifo], alpha_modes: vec![wgt::CompositeAlphaMode::Opaque], + // Statically set to RENDER_ATTACHMENT for now. See https://gpuweb.github.io/gpuweb/#dom-gpucanvasconfiguration-usage + usages: wgt::TextureUsages::RENDER_ATTACHMENT, } }