Skip to content

Commit cf83de3

Browse files
chore!: remove deprecated type aliases for idents. in 2024-08 spec. rename (gfx-rs#7790)
This backs out commit 9436d56.
1 parent 82fa8e2 commit cf83de3

3 files changed

Lines changed: 0 additions & 59 deletions

File tree

wgpu-core/src/command/transfer.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,6 @@ pub type TexelCopyBufferInfo = wgt::TexelCopyBufferInfo<BufferId>;
3030
pub type TexelCopyTextureInfo = wgt::TexelCopyTextureInfo<TextureId>;
3131
pub type CopyExternalImageDestInfo = wgt::CopyExternalImageDestInfo<TextureId>;
3232

33-
#[deprecated(
34-
since = "24.0.0",
35-
note = "This has been renamed to `TexelCopyBufferInfo`, and will be removed in 25.0.0."
36-
)]
37-
pub type ImageCopyBuffer = wgt::TexelCopyBufferInfo<BufferId>;
38-
39-
#[deprecated(
40-
since = "24.0.0",
41-
note = "This has been renamed to `TexelCopyTextureInfo`, and will be removed in 25.0.0."
42-
)]
43-
pub type ImageCopyTexture = wgt::TexelCopyTextureInfo<TextureId>;
44-
45-
#[deprecated(
46-
since = "24.0.0",
47-
note = "This has been renamed to `TexelCopyTextureSourceInfo`, and will be removed in 25.0.0."
48-
)]
49-
pub type ImageCopyTextureTagged = wgt::CopyExternalImageDestInfo<TextureId>;
50-
5133
#[derive(Clone, Copy, Debug)]
5234
pub enum CopySide {
5335
Source,

wgpu-types/src/lib.rs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6406,13 +6406,6 @@ pub struct TexelCopyBufferLayout {
64066406
pub rows_per_image: Option<u32>,
64076407
}
64086408

6409-
/// Old name for a [`TexelCopyBufferLayout`].
6410-
#[deprecated(
6411-
since = "24.0.0",
6412-
note = "This has been renamed to `TexelCopyBufferLayout`, and will be removed in 25.0.0."
6413-
)]
6414-
pub type ImageDataLayout = TexelCopyBufferLayout;
6415-
64166409
/// Specific type of a buffer binding.
64176410
///
64186411
/// Corresponds to [WebGPU `GPUBufferBindingType`](
@@ -6865,13 +6858,6 @@ pub struct TexelCopyBufferInfo<B> {
68656858
pub layout: TexelCopyBufferLayout,
68666859
}
68676860

6868-
/// Old name for a [`TexelCopyBufferInfo`].
6869-
#[deprecated(
6870-
since = "24.0.0",
6871-
note = "This has been renamed to `TexelCopyBufferInfo`, and will be removed in 25.0.0."
6872-
)]
6873-
pub type ImageCopyBuffer<B> = TexelCopyBufferInfo<B>;
6874-
68756861
/// View of a texture which can be used to copy to/from a buffer/texture.
68766862
///
68776863
/// Corresponds to [WebGPU `GPUTexelCopyTextureInfo`](
@@ -6913,13 +6899,6 @@ impl<T> TexelCopyTextureInfo<T> {
69136899
}
69146900
}
69156901

6916-
/// Old name for a [`TexelCopyTextureInfo`].
6917-
#[deprecated(
6918-
since = "24.0.0",
6919-
note = "This has been renamed to `TexelCopyTextureInfo`, and will be removed in 25.0.0."
6920-
)]
6921-
pub type ImageCopyTexture<T> = TexelCopyTextureInfo<T>;
6922-
69236902
/// View of an external texture that can be used to copy to a texture.
69246903
///
69256904
/// Corresponds to [WebGPU `GPUCopyExternalImageSourceInfo`](
@@ -6943,14 +6922,6 @@ pub struct CopyExternalImageSourceInfo {
69436922
pub flip_y: bool,
69446923
}
69456924

6946-
/// Old name for a [`CopyExternalImageSourceInfo`].
6947-
#[deprecated(
6948-
since = "24.0.0",
6949-
note = "This has been renamed to `CopyExternalImageSourceInfo`, and will be removed in 25.0.0."
6950-
)]
6951-
#[cfg(all(target_arch = "wasm32", feature = "web"))]
6952-
pub type ImageCopyExternalImage = CopyExternalImageSourceInfo;
6953-
69546925
/// Source of an external texture copy.
69556926
///
69566927
/// Corresponds to the [implicit union type on WebGPU `GPUCopyExternalImageSourceInfo.source`](
@@ -7089,13 +7060,6 @@ impl<T> CopyExternalImageDestInfo<T> {
70897060
}
70907061
}
70917062

7092-
/// Old name for a [`CopyExternalImageDestInfo`].
7093-
#[deprecated(
7094-
since = "24.0.0",
7095-
note = "This has been renamed to `CopyExternalImageDestInfo`, and will be removed in 25.0.0."
7096-
)]
7097-
pub type ImageCopyTextureTagged<T> = CopyExternalImageDestInfo<T>;
7098-
70997063
/// Subresource range within an image
71007064
#[repr(C)]
71017065
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]

wgpu/src/lib.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,9 @@ pub use wgt::{
9292
COPY_BYTES_PER_ROW_ALIGNMENT, MAP_ALIGNMENT, PUSH_CONSTANT_ALIGNMENT,
9393
QUERY_RESOLVE_BUFFER_ALIGNMENT, QUERY_SET_MAX_QUERIES, QUERY_SIZE, VERTEX_STRIDE_ALIGNMENT,
9494
};
95-
#[expect(deprecated)]
96-
pub use wgt::{ImageCopyBuffer, ImageCopyTexture, ImageCopyTextureTagged, ImageDataLayout};
9795
// wasm-only types, we try to keep as many types non-platform
9896
// specific, but these need to depend on web-sys.
9997
#[cfg(web)]
100-
#[expect(deprecated)]
101-
pub use wgt::ImageCopyExternalImage;
102-
#[cfg(web)]
10398
pub use wgt::{CopyExternalImageSourceInfo, ExternalImageSource};
10499

105100
/// Re-export of our `naga` dependency.

0 commit comments

Comments
 (0)