use bevy_crevice reexport from bevy_render

Author: mockersf

Cargo.toml

@@ -99,7 +99,6 @@ ron = "0.7.0"
 serde = { version = "1", features = ["derive"] }
 # Needed to poll Task examples
 futures-lite = "1.11.3"
-crevice = { path = "crates/crevice", version = "0.8.0", features = ["glam"] }
 
 [[example]]
 name = "hello_world"

crates/bevy_pbr/Cargo.toml

@@ -26,5 +26,4 @@ bevy_window = { path = "../bevy_window", version = "0.5.0" }
 bitflags = "1.2"
 # direct dependency required for derive macro
 bytemuck = { version = "1", features = ["derive"] }
-crevice = { path = "../crevice", version = "0.8.0", features = ["glam"] }
 wgpu = { version = "0.12.0", features = ["spirv"] }

crates/bevy_pbr/src/material.rs

@@ -5,13 +5,13 @@ use bevy_ecs::system::{lifetimeless::SRes, SystemParamItem};
 use bevy_math::Vec4;
 use bevy_reflect::TypeUuid;
 use bevy_render::{
+    bevy_crevice::std140::{AsStd140, Std140},
     color::Color,
     render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets},
     render_resource::{BindGroup, Buffer, BufferInitDescriptor, BufferUsages},
     renderer::RenderDevice,
     texture::Image,
 };
-use crevice::std140::{AsStd140, Std140};
 use wgpu::{BindGroupDescriptor, BindGroupEntry, BindingResource};
 
 pub const DEFAULT_STANDARD_MATERIAL_HANDLE: HandleUntyped =

crates/bevy_pbr/src/render/light.rs

@@ -12,6 +12,7 @@ use bevy_ecs::{
 };
 use bevy_math::{const_vec3, Mat4, UVec3, UVec4, Vec2, Vec3, Vec4, Vec4Swizzles};
 use bevy_render::{
+    bevy_crevice::std140::AsStd140,
     camera::{Camera, CameraProjection},
     color::Color,
     mesh::Mesh,
@@ -29,7 +30,6 @@ use bevy_render::{
 };
 use bevy_transform::components::GlobalTransform;
 use bevy_utils::{tracing::warn, HashMap};
-use crevice::std140::AsStd140;
 use std::num::NonZeroU32;
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]

crates/bevy_pbr/src/render/mesh.rs

@@ -11,6 +11,7 @@ use bevy_ecs::{
 use bevy_math::Mat4;
 use bevy_reflect::TypeUuid;
 use bevy_render::{
+    bevy_crevice::std140::AsStd140,
     mesh::Mesh,
     render_asset::RenderAssets,
     render_component::{ComponentUniforms, DynamicUniformIndex, UniformComponentPlugin},
@@ -22,7 +23,6 @@ use bevy_render::{
     RenderApp, RenderStage,
 };
 use bevy_transform::components::GlobalTransform;
-use crevice::std140::AsStd140;
 use wgpu::{
     Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, SamplerBindingType, TextureDimension,
     TextureFormat, TextureViewDescriptor,

crates/bevy_pbr/src/render/mod.rs

@@ -13,6 +13,7 @@ use bevy_ecs::{
     system::{lifetimeless::*, SystemParamItem},
 };
 use bevy_render::{
+    bevy_crevice::std140::AsStd140,
     mesh::Mesh,
     render_asset::RenderAssets,
     render_phase::{
@@ -23,7 +24,6 @@ use bevy_render::{
     renderer::RenderDevice,
     view::{ExtractedView, Msaa, VisibleEntities},
 };
-use crevice::std140::AsStd140;
 
 // NOTE: These must match the bit flags in bevy_pbr2/src/render/pbr.wgsl!
 bitflags::bitflags! {

crates/bevy_render/Cargo.toml

@@ -50,7 +50,7 @@ hex = "0.4.2"
 hexasphere = "6.0.0"
 parking_lot = "0.11.0"
 regex = "1.5"
-crevice = { path = "../crevice", version = "0.8.0", features = ["glam"] }
+bevy_crevice = { path = "../bevy_crevice", version = "0.5.0", features = ["glam"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wgpu = { version = "0.12.0", features = ["spirv", "webgl"] }

crates/bevy_render/src/lib.rs

@@ -42,6 +42,7 @@ use crate::{
 };
 use bevy_app::{App, AppLabel, Plugin};
 use bevy_asset::{AddAsset, AssetServer};
+pub use bevy_crevice;
 use bevy_ecs::prelude::*;
 use std::ops::{Deref, DerefMut};
 

crates/bevy_render/src/render_component.rs

@@ -1,4 +1,5 @@
 use crate::{
+    bevy_crevice::std140::AsStd140,
     render_resource::DynamicUniformVec,
     renderer::{RenderDevice, RenderQueue},
     RenderApp, RenderStage,
@@ -14,7 +15,6 @@ use bevy_ecs::{
         RunSystem, SystemParamItem,
     },
 };
-use crevice::std140::AsStd140;
 use std::{marker::PhantomData, ops::Deref};
 
 /// Stores the index of a uniform inside of [`ComponentUniforms`].

crates/bevy_render/src/render_resource/uniform_vec.rs

@@ -1,8 +1,8 @@
 use crate::{
+    bevy_crevice::std140::{self, AsStd140, DynamicUniform, Std140},
     render_resource::Buffer,
     renderer::{RenderDevice, RenderQueue},
 };
-use crevice::std140::{self, AsStd140, DynamicUniform, Std140};
 use std::num::NonZeroU64;
 use wgpu::{BindingResource, BufferBinding, BufferDescriptor, BufferUsages};
 

crates/bevy_render/src/view/mod.rs

@@ -9,6 +9,7 @@ use wgpu::{
 pub use window::*;
 
 use crate::{
+    bevy_crevice::std140::AsStd140,
     camera::{ExtractedCamera, ExtractedCameraNames},
     render_resource::{DynamicUniformVec, Texture, TextureView},
     renderer::{RenderDevice, RenderQueue},
@@ -19,7 +20,6 @@ use bevy_app::{App, Plugin};
 use bevy_ecs::prelude::*;
 use bevy_math::{Mat4, Vec3};
 use bevy_transform::components::GlobalTransform;
-use crevice::std140::AsStd140;
 
 pub struct ViewPlugin;
 

crates/bevy_sprite/Cargo.toml

@@ -26,7 +26,6 @@ bevy_utils = { path = "../bevy_utils", version = "0.5.0" }
 
 # other
 bytemuck = { version = "1.5", features = ["derive"] }
-crevice = { path = "../crevice", version = "0.8.0", features = ["glam"] }
 guillotiere = "0.6.0"
 thiserror = "1.0"
 rectangle-pack = "0.4"

crates/bevy_sprite/src/render/mod.rs

@@ -13,6 +13,7 @@ use bevy_ecs::{
 };
 use bevy_math::{const_vec3, Mat4, Vec2, Vec3, Vec4Swizzles};
 use bevy_render::{
+    bevy_crevice::std140::AsStd140,
     color::Color,
     render_asset::RenderAssets,
     render_phase::{Draw, DrawFunctions, RenderPhase, TrackedRenderPass},
@@ -25,7 +26,6 @@ use bevy_render::{
 use bevy_transform::components::GlobalTransform;
 use bevy_utils::HashMap;
 use bytemuck::{Pod, Zeroable};
-use crevice::std140::AsStd140;
 use wgpu::SamplerBindingType;
 
 pub struct SpritePipeline {

crates/bevy_ui/Cargo.toml

@@ -32,5 +32,4 @@ stretch = "0.3.2"
 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"

crates/bevy_ui/src/render/pipeline.rs

@@ -1,9 +1,9 @@
 use bevy_ecs::prelude::*;
 use bevy_render::{
-    render_resource::*, renderer::RenderDevice, texture::BevyDefault, view::ViewUniform,
+    bevy_crevice::std140::AsStd140, render_resource::*, renderer::RenderDevice,
+    texture::BevyDefault, view::ViewUniform,
 };
 
-use crevice::std140::AsStd140;
 use wgpu::SamplerBindingType;
 
 pub struct UiPipeline {

examples/shader/shader_material.rs

@@ -8,6 +8,7 @@ use bevy::{
     prelude::*,
     reflect::TypeUuid,
     render::{
+        bevy_crevice::std140::{AsStd140, Std140},
         camera::PerspectiveCameraBundle,
         render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets},
         render_component::ExtractComponentPlugin,
@@ -21,7 +22,6 @@ use bevy::{
         RenderApp, RenderStage,
     },
 };
-use crevice::std140::{AsStd140, Std140};
 
 fn main() {
     App::new()