diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml index 977f9e2757..f3941d045d 100644 --- a/crates/bevy_gltf/Cargo.toml +++ b/crates/bevy_gltf/Cargo.toml @@ -29,4 +29,3 @@ thiserror = "1.0" anyhow = "1.0.4" base64 = "0.13.0" percent-encoding = "2.1" -wgpu = "0.12.0" diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs index e8395df500..d7404b4088 100644 --- a/crates/bevy_gltf/src/loader.rs +++ b/crates/bevy_gltf/src/loader.rs @@ -14,6 +14,9 @@ use bevy_render::{ color::Color, mesh::{Indices, Mesh, VertexAttributeValues}, primitives::{Aabb, Frustum}, + render_resource::{ + AddressMode, FilterMode, PrimitiveTopology, SamplerDescriptor, TextureFormat, + }, texture::{Image, ImageType, TextureError}, view::VisibleEntities, }; @@ -30,7 +33,6 @@ use gltf::{ }; use std::{collections::VecDeque, path::Path}; use thiserror::Error; -use wgpu::{AddressMode, FilterMode, PrimitiveTopology, SamplerDescriptor, TextureFormat}; use crate::{Gltf, GltfNode}; diff --git a/crates/bevy_render/src/render_resource/mod.rs b/crates/bevy_render/src/render_resource/mod.rs index 22232f4a26..5069a896f9 100644 --- a/crates/bevy_render/src/render_resource/mod.rs +++ b/crates/bevy_render/src/render_resource/mod.rs @@ -33,10 +33,10 @@ pub use wgpu::{ Limits as WgpuLimits, LoadOp, MultisampleState, Operations, Origin3d, PipelineLayout, PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPassColorAttachment, RenderPassDepthStencilAttachment, RenderPassDescriptor, - RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerDescriptor, ShaderModule, - ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState, StencilOperation, - StencilState, StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, - TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor, TextureViewDimension, - VertexAttribute, VertexBufferLayout as RawVertexBufferLayout, VertexFormat, - VertexState as RawVertexState, VertexStepMode, + RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerBindingType, SamplerDescriptor, + ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState, + StencilOperation, StencilState, StorageTextureAccess, TextureAspect, TextureDescriptor, + TextureDimension, TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor, + TextureViewDimension, VertexAttribute, VertexBufferLayout as RawVertexBufferLayout, + VertexFormat, VertexState as RawVertexState, VertexStepMode, }; diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index 8e01359985..6416300628 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -31,4 +31,3 @@ guillotiere = "0.6.0" thiserror = "1.0" rectangle-pack = "0.4" serde = { version = "1", features = ["derive"] } -wgpu = "0.12.0" diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs index a58b53d5d7..e9bb91fca6 100644 --- a/crates/bevy_sprite/src/render/mod.rs +++ b/crates/bevy_sprite/src/render/mod.rs @@ -26,7 +26,6 @@ use bevy_transform::components::GlobalTransform; use bevy_utils::HashMap; use bytemuck::{Pod, Zeroable}; use crevice::std140::AsStd140; -use wgpu::SamplerBindingType; pub struct SpritePipeline { view_layout: BindGroupLayout, diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index f6227010a8..7b2acbff68 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -33,4 +33,3 @@ serde = { version = "1", features = ["derive"] } smallvec = { version = "1.6", features = ["union", "const_generics"] } bytemuck = { version = "1.5", features = ["derive"] } crevice = { path = "../crevice", version = "0.8.0", features = ["glam"] } -wgpu = "0.12.0" diff --git a/crates/bevy_ui/src/render/pipeline.rs b/crates/bevy_ui/src/render/pipeline.rs index 5acb69f6a4..8e6d36fe96 100644 --- a/crates/bevy_ui/src/render/pipeline.rs +++ b/crates/bevy_ui/src/render/pipeline.rs @@ -4,7 +4,6 @@ use bevy_render::{ }; use crevice::std140::AsStd140; -use wgpu::SamplerBindingType; pub struct UiPipeline { pub view_layout: BindGroupLayout,