diff options
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/image/atlas.rs (renamed from wgpu/src/texture/atlas.rs) | 0 | ||||
-rw-r--r-- | wgpu/src/image/atlas/allocation.rs (renamed from wgpu/src/texture/atlas/allocation.rs) | 2 | ||||
-rw-r--r-- | wgpu/src/image/atlas/allocator.rs (renamed from wgpu/src/texture/atlas/allocator.rs) | 0 | ||||
-rw-r--r-- | wgpu/src/image/atlas/entry.rs (renamed from wgpu/src/texture/atlas/entry.rs) | 3 | ||||
-rw-r--r-- | wgpu/src/image/atlas/layer.rs (renamed from wgpu/src/texture/atlas/layer.rs) | 2 | ||||
-rw-r--r-- | wgpu/src/texture.rs | 3 |
6 files changed, 4 insertions, 6 deletions
diff --git a/wgpu/src/texture/atlas.rs b/wgpu/src/image/atlas.rs index 86a5ff49..86a5ff49 100644 --- a/wgpu/src/texture/atlas.rs +++ b/wgpu/src/image/atlas.rs diff --git a/wgpu/src/texture/atlas/allocation.rs b/wgpu/src/image/atlas/allocation.rs index e17b3f8c..59b7239f 100644 --- a/wgpu/src/texture/atlas/allocation.rs +++ b/wgpu/src/image/atlas/allocation.rs @@ -1,4 +1,4 @@ -use crate::texture::atlas::{self, allocator}; +use crate::image::atlas::{self, allocator}; #[derive(Debug)] pub enum Allocation { diff --git a/wgpu/src/texture/atlas/allocator.rs b/wgpu/src/image/atlas/allocator.rs index 7a4ff5b1..7a4ff5b1 100644 --- a/wgpu/src/texture/atlas/allocator.rs +++ b/wgpu/src/image/atlas/allocator.rs diff --git a/wgpu/src/texture/atlas/entry.rs b/wgpu/src/image/atlas/entry.rs index 2c064665..0310fc54 100644 --- a/wgpu/src/texture/atlas/entry.rs +++ b/wgpu/src/image/atlas/entry.rs @@ -1,4 +1,4 @@ -use crate::texture::atlas; +use crate::image::atlas; #[derive(Debug)] pub enum Entry { @@ -10,6 +10,7 @@ pub enum Entry { } impl Entry { + #[cfg(feature = "image")] pub fn size(&self) -> (u32, u32) { match self { Entry::Contiguous(allocation) => allocation.size(), diff --git a/wgpu/src/texture/atlas/layer.rs b/wgpu/src/image/atlas/layer.rs index b025d8a1..b1084ed9 100644 --- a/wgpu/src/texture/atlas/layer.rs +++ b/wgpu/src/image/atlas/layer.rs @@ -1,4 +1,4 @@ -use crate::texture::atlas::Allocator; +use crate::image::atlas::Allocator; #[derive(Debug)] pub enum Layer { diff --git a/wgpu/src/texture.rs b/wgpu/src/texture.rs deleted file mode 100644 index 00b60bfa..00000000 --- a/wgpu/src/texture.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod atlas; - -pub use atlas::Atlas; |