diff --git a/wgpu-core/src/command/transfer.rs b/wgpu-core/src/command/transfer.rs index 740763a29..acfaa8c52 100644 --- a/wgpu-core/src/command/transfer.rs +++ b/wgpu-core/src/command/transfer.rs @@ -31,6 +31,24 @@ pub type TexelCopyBufferInfo = wgt::TexelCopyBufferInfo; pub type TexelCopyTextureInfo = wgt::TexelCopyTextureInfo; pub type CopyExternalImageDestInfo = wgt::CopyExternalImageDestInfo; +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyBufferInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyBuffer = wgt::TexelCopyBufferInfo; + +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyTextureInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyTexture = wgt::TexelCopyTextureInfo; + +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyTextureSourceInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyTextureTagged = wgt::CopyExternalImageDestInfo; + #[derive(Clone, Copy, Debug)] pub enum CopySide { Source, diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs index 76a273fc9..17f8e43f3 100644 --- a/wgpu-types/src/lib.rs +++ b/wgpu-types/src/lib.rs @@ -6404,6 +6404,13 @@ pub struct TexelCopyBufferLayout { pub rows_per_image: Option, } +/// Old name for a [`TexelCopyBufferLayout`]. +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyBufferLayout`, and will be removed in 25.0.0." +)] +pub type ImageDataLayout = TexelCopyBufferLayout; + /// Specific type of a buffer binding. /// /// Corresponds to [WebGPU `GPUBufferBindingType`]( @@ -6821,6 +6828,13 @@ pub struct TexelCopyBufferInfo { pub layout: TexelCopyBufferLayout, } +/// Old name for a [`TexelCopyBufferInfo`]. +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyBufferInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyBuffer = TexelCopyBufferInfo; + /// View of a texture which can be used to copy to/from a buffer/texture. /// /// Corresponds to [WebGPU `GPUTexelCopyTextureInfo`]( @@ -6862,6 +6876,13 @@ impl TexelCopyTextureInfo { } } +/// Old name for a [`TexelCopyTextureInfo`]. +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `TexelCopyTextureInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyTexture = TexelCopyTextureInfo; + /// View of an external texture that can be used to copy to a texture. /// /// Corresponds to [WebGPU `GPUCopyExternalImageSourceInfo`]( @@ -6885,6 +6906,14 @@ pub struct CopyExternalImageSourceInfo { pub flip_y: bool, } +/// Old name for a [`CopyExternalImageSourceInfo`]. +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `CopyExternalImageSourceInfo`, and will be removed in 25.0.0." +)] +#[cfg(target_arch = "wasm32")] +pub type ImageCopyExternalImage = CopyExternalImageSourceInfo; + /// Source of an external texture copy. /// /// Corresponds to the [implicit union type on WebGPU `GPUCopyExternalImageSourceInfo.source`]( @@ -7021,6 +7050,13 @@ impl CopyExternalImageDestInfo { } } +/// Old name for a [`CopyExternalImageDestInfo`]. +#[deprecated( + since = "24.0.0", + note = "This has been renamed to `CopyExternalImageDestInfo`, and will be removed in 25.0.0." +)] +pub type ImageCopyTextureTagged = CopyExternalImageDestInfo; + /// Subresource range within an image #[repr(C)] #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)] diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index ef9ffdc65..77c5a0948 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -74,9 +74,14 @@ pub use wgt::{ COPY_BYTES_PER_ROW_ALIGNMENT, MAP_ALIGNMENT, PUSH_CONSTANT_ALIGNMENT, QUERY_RESOLVE_BUFFER_ALIGNMENT, QUERY_SET_MAX_QUERIES, QUERY_SIZE, VERTEX_STRIDE_ALIGNMENT, }; +#[allow(deprecated)] +pub use wgt::{ImageCopyBuffer, ImageCopyTexture, ImageCopyTextureTagged, ImageDataLayout}; // wasm-only types, we try to keep as many types non-platform // specific, but these need to depend on web-sys. #[cfg(any(webgpu, webgl))] +#[allow(deprecated)] +pub use wgt::ImageCopyExternalImage; +#[cfg(any(webgpu, webgl))] pub use wgt::{CopyExternalImageSourceInfo, ExternalImageSource}; //