35ac1b152e
# Objective Keep core dependencies up to date. ## Solution Update the dependencies. wgpu 0.19 only supports raw-window-handle (rwh) 0.6, so bumping that was included in this. The rwh 0.6 version bump is just the simplest way of doing it. There might be a way we can take advantage of wgpu's new safe surface creation api, but I'm not familiar enough with bevy's window management to untangle it and my attempt ended up being a mess of lifetimes and rustc complaining about missing trait impls (that were implemented). Thanks to @MiniaczQ for the (much simpler) rwh 0.6 version bump code. Unblocks https://github.com/bevyengine/bevy/pull/9172 and https://github.com/bevyengine/bevy/pull/10812 ~~This might be blocked on cpal and oboe updating their ndk versions to 0.8, as they both currently target ndk 0.7 which uses rwh 0.5.2~~ Tested on android, and everything seems to work correctly (audio properly stops when minimized, and plays when re-focusing the app). --- ## Changelog - `wgpu` has been updated to 0.19! The long awaited arcanization has been merged (for more info, see https://gfx-rs.github.io/2023/11/24/arcanization.html), and Vulkan should now be working again on Intel GPUs. - Targeting WebGPU now requires that you add the new `webgpu` feature (setting the `RUSTFLAGS` environment variable to `--cfg=web_sys_unstable_apis` is still required). This feature currently overrides the `webgl2` feature if you have both enabled (the `webgl2` feature is enabled by default), so it is not recommended to add it as a default feature to libraries without putting it behind a flag that allows library users to opt out of it! In the future we plan on supporting wasm binaries that can target both webgl2 and webgpu now that wgpu added support for doing so (see https://github.com/bevyengine/bevy/issues/11505). - `raw-window-handle` has been updated to version 0.6. ## Migration Guide - `bevy_render::instance_index::get_instance_index()` has been removed as the webgl2 workaround is no longer required as it was fixed upstream in wgpu. The `BASE_INSTANCE_WORKAROUND` shaderdef has also been removed. - WebGPU now requires the new `webgpu` feature to be enabled. The `webgpu` feature currently overrides the `webgl2` feature so you no longer need to disable all default features and re-add them all when targeting `webgpu`, but binaries built with both the `webgpu` and `webgl2` features will only target the webgpu backend, and will only work on browsers that support WebGPU. - Places where you conditionally compiled things for webgl2 need to be updated because of this change, eg: - `#[cfg(any(not(feature = "webgl"), not(target_arch = "wasm32")))]` becomes `#[cfg(any(not(feature = "webgl") ,not(target_arch = "wasm32"), feature = "webgpu"))]` - `#[cfg(all(feature = "webgl", target_arch = "wasm32"))]` becomes `#[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]` - `if cfg!(all(feature = "webgl", target_arch = "wasm32"))` becomes `if cfg!(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))` - `create_texture_with_data` now also takes a `TextureDataOrder`. You can probably just set this to `TextureDataOrder::default()` - `TextureFormat`'s `block_size` has been renamed to `block_copy_size` - See the `wgpu` changelog for anything I might've missed: https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md --------- Co-authored-by: François <mockersf@gmail.com>
65 lines
2.6 KiB
Rust
65 lines
2.6 KiB
Rust
mod batched_uniform_buffer;
|
|
mod bind_group;
|
|
mod bind_group_entries;
|
|
mod bind_group_layout;
|
|
mod bind_group_layout_entries;
|
|
mod buffer;
|
|
mod buffer_vec;
|
|
mod gpu_array_buffer;
|
|
mod pipeline;
|
|
mod pipeline_cache;
|
|
mod pipeline_specializer;
|
|
pub mod resource_macros;
|
|
mod shader;
|
|
mod storage_buffer;
|
|
mod texture;
|
|
mod uniform_buffer;
|
|
|
|
pub use bind_group::*;
|
|
pub use bind_group_entries::*;
|
|
pub use bind_group_layout::*;
|
|
pub use bind_group_layout_entries::*;
|
|
pub use buffer::*;
|
|
pub use buffer_vec::*;
|
|
pub use gpu_array_buffer::*;
|
|
pub use pipeline::*;
|
|
pub use pipeline_cache::*;
|
|
pub use pipeline_specializer::*;
|
|
pub use shader::*;
|
|
pub use storage_buffer::*;
|
|
pub use texture::*;
|
|
pub use uniform_buffer::*;
|
|
|
|
// TODO: decide where re-exports should go
|
|
pub use wgpu::{
|
|
util::{BufferInitDescriptor, DrawIndexedIndirectArgs, DrawIndirectArgs, TextureDataOrder},
|
|
AdapterInfo as WgpuAdapterInfo, AddressMode, BindGroupDescriptor, BindGroupEntry,
|
|
BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource, BindingType, BlendComponent,
|
|
BlendFactor, BlendOperation, BlendState, BufferAddress, BufferAsyncError, BufferBinding,
|
|
BufferBindingType, BufferDescriptor, BufferSize, BufferUsages, ColorTargetState, ColorWrites,
|
|
CommandEncoder, CommandEncoderDescriptor, CompareFunction, ComputePass, ComputePassDescriptor,
|
|
ComputePipelineDescriptor as RawComputePipelineDescriptor, DepthBiasState, DepthStencilState,
|
|
Extent3d, Face, Features as WgpuFeatures, FilterMode, FragmentState as RawFragmentState,
|
|
FrontFace, ImageCopyBuffer, ImageCopyBufferBase, ImageCopyTexture, ImageCopyTextureBase,
|
|
ImageDataLayout, ImageSubresourceRange, IndexFormat, Limits as WgpuLimits, LoadOp, Maintain,
|
|
MapMode, MultisampleState, Operations, Origin3d, PipelineLayout, PipelineLayoutDescriptor,
|
|
PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange, RenderPassColorAttachment,
|
|
RenderPassDepthStencilAttachment, RenderPassDescriptor,
|
|
RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerBindingType, SamplerDescriptor,
|
|
ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState,
|
|
StencilOperation, StencilState, StorageTextureAccess, StoreOp, TextureAspect,
|
|
TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages,
|
|
TextureViewDescriptor, TextureViewDimension, VertexAttribute,
|
|
VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState,
|
|
VertexStepMode,
|
|
};
|
|
|
|
pub mod encase {
|
|
pub use bevy_encase_derive::ShaderType;
|
|
pub use encase::*;
|
|
}
|
|
|
|
pub use self::encase::{ShaderSize, ShaderType};
|
|
|
|
pub use naga::ShaderStage;
|