From 43e8a156fb4739abee3060c53140f4a94cab9ae5 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Fri, 8 Oct 2021 19:55:24 +0000 Subject: [PATCH] Upgrade to wgpu 0.11 (#2933) Upgrades both the old and new renderer to wgpu 0.11 (and naga 0.7). This builds on @zicklag's work here #2556. Co-authored-by: Carter Anderson --- Cargo.toml | 1 + crates/bevy_render/src/render_graph/base.rs | 6 +- .../nodes/window_swapchain_node.rs | 6 +- .../headless_render_resource_context.rs | 8 +-- .../src/renderer/render_resource_context.rs | 8 +-- crates/bevy_render/src/shader/shader.rs | 6 +- .../src/texture/texture_descriptor.rs | 8 +-- .../src/texture/texture_dimension.rs | 2 +- .../bevy_sprite/src/render/sprite_sheet.vert | 2 +- crates/bevy_wgpu/Cargo.toml | 2 +- .../wgpu_resource_diagnostics_plugin.rs | 21 ++---- crates/bevy_wgpu/src/lib.rs | 9 +-- .../src/renderer/wgpu_render_context.rs | 11 ++- .../renderer/wgpu_render_resource_context.rs | 67 ++++++++++--------- crates/bevy_wgpu/src/wgpu_renderer.rs | 21 +++--- crates/bevy_wgpu/src/wgpu_resources.rs | 13 ++-- crates/bevy_wgpu/src/wgpu_type_converter.rs | 51 +++++++------- examples/3d/render_to_texture.rs | 6 +- examples/3d/wireframe.rs | 2 +- examples/shader/custom_shader_pipelined.rs | 8 +-- examples/window/multiple_windows.rs | 6 +- pipelined/bevy_core_pipeline/src/lib.rs | 2 +- .../src/main_pass_driver.rs | 12 +++- pipelined/bevy_gltf2/Cargo.toml | 2 +- pipelined/bevy_pbr2/Cargo.toml | 2 +- pipelined/bevy_pbr2/src/material.rs | 6 +- pipelined/bevy_pbr2/src/render/depth.wgsl | 4 +- pipelined/bevy_pbr2/src/render/light.rs | 8 +-- pipelined/bevy_pbr2/src/render/mod.rs | 37 +++++----- pipelined/bevy_pbr2/src/render/pbr.wgsl | 16 ++--- pipelined/bevy_render2/Cargo.toml | 4 +- pipelined/bevy_render2/src/lib.rs | 4 +- pipelined/bevy_render2/src/mesh/mesh/mod.rs | 8 ++- .../src/render_resource/buffer_vec.rs | 10 +-- .../bevy_render2/src/render_resource/mod.rs | 14 ++-- .../src/render_resource/texture.rs | 26 +++++-- .../src/render_resource/uniform_vec.rs | 4 +- pipelined/bevy_render2/src/renderer/mod.rs | 20 ++++-- .../src/renderer/render_device.rs | 8 +-- pipelined/bevy_render2/src/shader/shader.rs | 36 +++++----- pipelined/bevy_render2/src/texture/image.rs | 3 +- pipelined/bevy_render2/src/view/window.rs | 47 +++++-------- pipelined/bevy_sprite2/src/render/mod.rs | 14 ++-- pipelined/bevy_sprite2/src/render/sprite.wgsl | 2 +- 44 files changed, 286 insertions(+), 267 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6bb9d5c940..5a4dca68a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"] license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/bevyengine/bevy" +resolver = "2" [workspace] exclude = ["benches"] diff --git a/crates/bevy_render/src/render_graph/base.rs b/crates/bevy_render/src/render_graph/base.rs index 6937c5b0a2..bd47db62c4 100644 --- a/crates/bevy_render/src/render_graph/base.rs +++ b/crates/bevy_render/src/render_graph/base.rs @@ -7,7 +7,7 @@ use crate::{ LoadOp, Operations, PassDescriptor, RenderPassColorAttachment, RenderPassDepthStencilAttachment, TextureAttachment, }, - texture::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsage}, + texture::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages}, Color, }; use bevy_ecs::{reflect::ReflectComponent, world::World}; @@ -126,7 +126,7 @@ pub(crate) fn add_base_graph(config: &BaseRenderGraphConfig, world: &mut World) dimension: TextureDimension::D2, format: TextureFormat::Depth32Float, /* PERF: vulkan docs recommend using 24 * bit depth for better performance */ - usage: TextureUsage::OUTPUT_ATTACHMENT, + usage: TextureUsages::OUTPUT_ATTACHMENT, }, ), ); @@ -220,7 +220,7 @@ pub(crate) fn add_base_graph(config: &BaseRenderGraphConfig, world: &mut World) sample_count: msaa.samples, dimension: TextureDimension::D2, format: TextureFormat::default(), - usage: TextureUsage::OUTPUT_ATTACHMENT, + usage: TextureUsages::OUTPUT_ATTACHMENT, }, ), ); diff --git a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs index 50df2ea883..52c7904e42 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs @@ -52,7 +52,7 @@ impl Node for WindowSwapChainNode { let render_resource_context = render_context.resources_mut(); - // create window swapchain when window is resized or created + // reconfigure surface window is resized or created if self .window_created_event_reader .iter(window_created_events) @@ -62,10 +62,10 @@ impl Node for WindowSwapChainNode { .iter(window_resized_events) .any(|e| e.id == window.id()) { - render_resource_context.create_swap_chain(window); + render_resource_context.configure_surface(window); } - let swap_chain_texture = render_resource_context.next_swap_chain_texture(window); + let swap_chain_texture = render_resource_context.next_surface_frame(window); output.set( WINDOW_TEXTURE, RenderResourceId::Texture(swap_chain_texture), diff --git a/crates/bevy_render/src/renderer/headless_render_resource_context.rs b/crates/bevy_render/src/renderer/headless_render_resource_context.rs index 738c065966..89f6c2e726 100644 --- a/crates/bevy_render/src/renderer/headless_render_resource_context.rs +++ b/crates/bevy_render/src/renderer/headless_render_resource_context.rs @@ -31,15 +31,15 @@ impl HeadlessRenderResourceContext { } impl RenderResourceContext for HeadlessRenderResourceContext { - fn create_swap_chain(&self, _window: &Window) {} + fn configure_surface(&self, _window: &Window) {} - fn next_swap_chain_texture(&self, _window: &Window) -> TextureId { + fn next_surface_frame(&self, _window: &Window) -> TextureId { TextureId::new() } - fn drop_swap_chain_texture(&self, _render_resource: TextureId) {} + fn drop_surface_frame(&self, _render_resource: TextureId) {} - fn drop_all_swap_chain_textures(&self) {} + fn drop_all_surface_frames(&self) {} fn create_sampler(&self, _sampler_descriptor: &SamplerDescriptor) -> SamplerId { SamplerId::new() diff --git a/crates/bevy_render/src/renderer/render_resource_context.rs b/crates/bevy_render/src/renderer/render_resource_context.rs index 9afa958aa8..9d16197e76 100644 --- a/crates/bevy_render/src/renderer/render_resource_context.rs +++ b/crates/bevy_render/src/renderer/render_resource_context.rs @@ -12,10 +12,10 @@ use downcast_rs::{impl_downcast, Downcast}; use std::ops::Range; pub trait RenderResourceContext: Downcast + Send + Sync + 'static { - fn create_swap_chain(&self, window: &Window); - fn next_swap_chain_texture(&self, window: &Window) -> TextureId; - fn drop_swap_chain_texture(&self, resource: TextureId); - fn drop_all_swap_chain_textures(&self); + fn configure_surface(&self, window: &Window); + fn next_surface_frame(&self, window: &Window) -> TextureId; + fn drop_surface_frame(&self, resource: TextureId); + fn drop_all_surface_frames(&self); fn create_sampler(&self, sampler_descriptor: &SamplerDescriptor) -> SamplerId; fn create_texture(&self, texture_descriptor: TextureDescriptor) -> TextureId; fn create_buffer(&self, buffer_info: BufferInfo) -> BufferId; diff --git a/crates/bevy_render/src/shader/shader.rs b/crates/bevy_render/src/shader/shader.rs index b8ea268546..5a8d2062a3 100644 --- a/crates/bevy_render/src/shader/shader.rs +++ b/crates/bevy_render/src/shader/shader.rs @@ -106,9 +106,9 @@ pub fn glsl_to_spirv( impl Into for ShaderStage { fn into(self) -> shaderc::ShaderKind { match self { - ShaderStage::Vertex => shaderc::ShaderKind::Vertex, - ShaderStage::Fragment => shaderc::ShaderKind::Fragment, - ShaderStage::Compute => shaderc::ShaderKind::Compute, + ShaderStages::VERTEX => shaderc::ShaderKind::Vertex, + ShaderStages::FRAGMENT => shaderc::ShaderKind::Fragment, + ShaderStages::COMPUTE => shaderc::ShaderKind::Compute, } } } diff --git a/crates/bevy_render/src/texture/texture_descriptor.rs b/crates/bevy_render/src/texture/texture_descriptor.rs index 7df3bc4070..9f83c86457 100644 --- a/crates/bevy_render/src/texture/texture_descriptor.rs +++ b/crates/bevy_render/src/texture/texture_descriptor.rs @@ -1,4 +1,4 @@ -use super::{Extent3d, Texture, TextureDimension, TextureFormat, TextureUsage}; +use super::{Extent3d, Texture, TextureDimension, TextureFormat, TextureUsages}; /// Describes a texture #[derive(Debug, Copy, Clone, Eq, PartialEq)] @@ -8,7 +8,7 @@ pub struct TextureDescriptor { pub sample_count: u32, pub dimension: TextureDimension, pub format: TextureFormat, - pub usage: TextureUsage, + pub usage: TextureUsages, } impl From<&Texture> for TextureDescriptor { @@ -19,7 +19,7 @@ impl From<&Texture> for TextureDescriptor { sample_count: 1, dimension: texture.dimension, format: texture.format, - usage: TextureUsage::SAMPLED | TextureUsage::COPY_DST, + usage: TextureUsages::SAMPLED | TextureUsages::COPY_DST, } } } @@ -36,7 +36,7 @@ impl Default for TextureDescriptor { sample_count: 1, dimension: TextureDimension::D2, format: TextureFormat::Rgba8UnormSrgb, - usage: TextureUsage::SAMPLED | TextureUsage::COPY_DST, + usage: TextureUsages::SAMPLED | TextureUsages::COPY_DST, } } } diff --git a/crates/bevy_render/src/texture/texture_dimension.rs b/crates/bevy_render/src/texture/texture_dimension.rs index 5791863591..e1cdda77eb 100644 --- a/crates/bevy_render/src/texture/texture_dimension.rs +++ b/crates/bevy_render/src/texture/texture_dimension.rs @@ -276,7 +276,7 @@ impl Default for TextureFormat { bitflags::bitflags! { #[repr(transparent)] - pub struct TextureUsage: u32 { + pub struct TextureUsages: u32 { const COPY_SRC = 1; const COPY_DST = 2; const SAMPLED = 4; diff --git a/crates/bevy_sprite/src/render/sprite_sheet.vert b/crates/bevy_sprite/src/render/sprite_sheet.vert index 62ecf33237..8380a12455 100644 --- a/crates/bevy_sprite/src/render/sprite_sheet.vert +++ b/crates/bevy_sprite/src/render/sprite_sheet.vert @@ -21,7 +21,7 @@ struct Rect { vec2 end; }; -layout(set = 1, binding = 1) buffer TextureAtlas_textures { +layout(set = 1, binding = 1) readonly buffer TextureAtlas_textures { Rect[] Textures; }; diff --git a/crates/bevy_wgpu/Cargo.toml b/crates/bevy_wgpu/Cargo.toml index 24d4cd5a07..b2f240b560 100644 --- a/crates/bevy_wgpu/Cargo.toml +++ b/crates/bevy_wgpu/Cargo.toml @@ -29,7 +29,7 @@ bevy_winit = { path = "../bevy_winit", optional = true, version = "0.5.0" } bevy_utils = { path = "../bevy_utils", version = "0.5.0" } # other -wgpu = "0.9" +wgpu = { version = "0.11.0", features = ["spirv"] } futures-lite = "1.4.0" crossbeam-channel = "0.5.0" crossbeam-utils = "0.8.1" diff --git a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs index 8dc74d543a..f9eee95683 100644 --- a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs +++ b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs @@ -29,9 +29,7 @@ impl WgpuResourceDiagnosticsPlugin { DiagnosticId::from_u128(305855369913076220671125671543184691267); pub const SHADER_MODULES: DiagnosticId = DiagnosticId::from_u128(287681470908132753275843248383768232237); - pub const SWAP_CHAINS: DiagnosticId = - DiagnosticId::from_u128(199253035828743332241465305105689014605); - pub const SWAP_CHAIN_OUTPUTS: DiagnosticId = + pub const SURFACE_FRAMES: DiagnosticId = DiagnosticId::from_u128(112048874168736161226721327099863374234); pub const TEXTURES: DiagnosticId = DiagnosticId::from_u128(305955424195390184883220102469231911115); @@ -47,10 +45,8 @@ impl WgpuResourceDiagnosticsPlugin { 10, )); - diagnostics.add(Diagnostic::new(Self::SWAP_CHAINS, "swap_chains", 10)); - diagnostics.add(Diagnostic::new( - Self::SWAP_CHAIN_OUTPUTS, + Self::SURFACE_FRAMES, "swap_chain_outputs", 10, )); @@ -99,19 +95,10 @@ impl WgpuResourceDiagnosticsPlugin { ); diagnostics.add_measurement( - Self::SWAP_CHAINS, + Self::SURFACE_FRAMES, render_resource_context .resources - .window_swap_chains - .read() - .len() as f64, - ); - - diagnostics.add_measurement( - Self::SWAP_CHAIN_OUTPUTS, - render_resource_context - .resources - .swap_chain_frames + .surface_textures .read() .len() as f64, ); diff --git a/crates/bevy_wgpu/src/lib.rs b/crates/bevy_wgpu/src/lib.rs index 75d2567d0c..e345fe2e7c 100644 --- a/crates/bevy_wgpu/src/lib.rs +++ b/crates/bevy_wgpu/src/lib.rs @@ -29,15 +29,12 @@ pub enum WgpuFeature { TimestampQuery, PipelineStatisticsQuery, MappablePrimaryBuffers, - SampledTextureBindingArray, - SampledTextureArrayDynamicIndexing, - SampledTextureArrayNonUniformIndexing, UnsizedBindingArray, MultiDrawIndirect, MultiDrawIndirectCount, PushConstants, AddressModeClampToBorder, - NonFillPolygonMode, + PolygonModeLine, TextureCompressionEtc2, TextureCompressionAstcLdr, TextureAdapterSpecificFormatFeatures, @@ -70,6 +67,8 @@ pub struct WgpuLimits { pub max_vertex_buffers: u32, pub max_vertex_attributes: u32, pub max_vertex_buffer_array_stride: u32, + pub min_storage_buffer_offset_alignment: u32, + pub min_uniform_buffer_offset_alignment: u32, } impl Default for WgpuLimits { @@ -96,6 +95,8 @@ impl Default for WgpuLimits { max_vertex_buffers: default.max_vertex_buffers, max_vertex_attributes: default.max_vertex_attributes, max_vertex_buffer_array_stride: default.max_vertex_buffer_array_stride, + min_storage_buffer_offset_alignment: default.min_storage_buffer_offset_alignment, + min_uniform_buffer_offset_alignment: default.min_uniform_buffer_offset_alignment, } } } diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs index d2aba29fa7..65f09b5fb1 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_context.rs @@ -231,8 +231,15 @@ fn get_texture_view<'a>( panic!("Color attachment {} does not exist.", name); } }, - TextureAttachment::Id(render_resource) => refs.textures.get(render_resource).unwrap_or_else(|| &refs.swap_chain_frames.get(render_resource).unwrap().output.view), - TextureAttachment::Input(_) => panic!("Encountered unset `TextureAttachment::Input`. The `RenderGraph` executor should always set `TextureAttachment::Inputs` to `TextureAttachment::RenderResource` before running. This is a bug, please report it!"), + TextureAttachment::Id(render_resource) => refs + .textures + .get(render_resource) + .unwrap_or_else(|| &refs.surface_textures.get(render_resource).unwrap().0), + TextureAttachment::Input(_) => panic!( + "Encountered unset `TextureAttachment::Input`. The `RenderGraph` executor should \ + always set `TextureAttachment::Inputs` to `TextureAttachment::RenderResource` before \ + running. This is a bug, please report it!" + ), } } diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs index 8e53d3c292..3031e7ca6e 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -31,7 +31,8 @@ pub struct WgpuRenderResourceContext { } pub const COPY_BYTES_PER_ROW_ALIGNMENT: usize = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT as usize; -pub const BIND_BUFFER_ALIGNMENT: usize = wgpu::BIND_BUFFER_ALIGNMENT as usize; +// TODO: fix this? +pub const BIND_BUFFER_ALIGNMENT: usize = 256; pub const COPY_BUFFER_ALIGNMENT: usize = wgpu::COPY_BUFFER_ALIGNMENT as usize; pub const PUSH_CONSTANT_ALIGNMENT: u32 = wgpu::PUSH_CONSTANT_ALIGNMENT; @@ -94,6 +95,7 @@ impl WgpuRenderResourceContext { y: source_origin[1], z: source_origin[2], }, + aspect: wgpu::TextureAspect::All, }, wgpu::ImageCopyTexture { texture: destination, @@ -103,6 +105,7 @@ impl WgpuRenderResourceContext { y: destination_origin[1], z: destination_origin[2], }, + aspect: wgpu::TextureAspect::All, }, size.wgpu_into(), ) @@ -134,6 +137,7 @@ impl WgpuRenderResourceContext { y: source_origin[1], z: source_origin[2], }, + aspect: wgpu::TextureAspect::All, }, wgpu::ImageCopyBuffer { buffer: destination, @@ -181,6 +185,7 @@ impl WgpuRenderResourceContext { y: destination_origin[1], z: destination_origin[2], }, + aspect: wgpu::TextureAspect::All, }, size.wgpu_into(), ); @@ -206,11 +211,11 @@ impl WgpuRenderResourceContext { let shader_stage = if binding.shader_stage == BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT { - wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT + wgpu::ShaderStages::VERTEX | wgpu::ShaderStages::FRAGMENT } else if binding.shader_stage == BindingShaderStage::VERTEX { - wgpu::ShaderStage::VERTEX + wgpu::ShaderStages::VERTEX } else if binding.shader_stage == BindingShaderStage::FRAGMENT { - wgpu::ShaderStage::FRAGMENT + wgpu::ShaderStages::FRAGMENT } else { panic!("Invalid binding shader stage.") }; @@ -230,14 +235,15 @@ impl WgpuRenderResourceContext { bind_group_layouts.insert(descriptor.id, bind_group_layout); } - fn try_next_swap_chain_texture(&self, window_id: bevy_window::WindowId) -> Option { - let mut window_swap_chains = self.resources.window_swap_chains.write(); - let mut swap_chain_outputs = self.resources.swap_chain_frames.write(); + fn try_next_surface_frame(&self, window_id: bevy_window::WindowId) -> Option { + let mut window_surfaces = self.resources.window_surfaces.write(); + let mut surface_frames = self.resources.surface_textures.write(); - let window_swap_chain = window_swap_chains.get_mut(&window_id).unwrap(); - let next_texture = window_swap_chain.get_current_frame().ok()?; + let window_surface = window_surfaces.get_mut(&window_id).unwrap(); + let next_texture = window_surface.get_current_texture().ok()?; + let view = next_texture.texture.create_view(&Default::default()); let id = TextureId::new(); - swap_chain_outputs.insert(id, next_texture); + surface_frames.insert(id, (view, next_texture)); Some(id) } } @@ -339,7 +345,6 @@ impl RenderResourceContext for WgpuRenderResourceContext { .create_shader_module(&wgpu::ShaderModuleDescriptor { label: None, source: wgpu::ShaderSource::SpirV(spirv), - flags: Default::default(), }); shader_modules.insert(shader_handle.clone_weak(), shader_module); } @@ -358,43 +363,39 @@ impl RenderResourceContext for WgpuRenderResourceContext { self.create_shader_module_from_source(shader_handle, shader); } - fn create_swap_chain(&self, window: &Window) { + fn configure_surface(&self, window: &Window) { let surfaces = self.resources.window_surfaces.read(); - let mut window_swap_chains = self.resources.window_swap_chains.write(); - let swap_chain_descriptor: wgpu::SwapChainDescriptor = window.wgpu_into(); + let surface_configuration: wgpu::SurfaceConfiguration = window.wgpu_into(); let surface = surfaces .get(&window.id()) .expect("No surface found for window."); - let swap_chain = self - .device - .create_swap_chain(surface, &swap_chain_descriptor); - - window_swap_chains.insert(window.id(), swap_chain); + surface.configure(&self.device, &surface_configuration); } - fn next_swap_chain_texture(&self, window: &bevy_window::Window) -> TextureId { - if let Some(texture_id) = self.try_next_swap_chain_texture(window.id()) { + fn next_surface_frame(&self, window: &bevy_window::Window) -> TextureId { + if let Some(texture_id) = self.try_next_surface_frame(window.id()) { texture_id } else { - self.resources - .window_swap_chains - .write() - .remove(&window.id()); - self.create_swap_chain(window); - self.try_next_swap_chain_texture(window.id()) + self.resources.window_surfaces.write().remove(&window.id()); + self.configure_surface(window); + self.try_next_surface_frame(window.id()) .expect("Failed to acquire next swap chain texture!") } } - fn drop_swap_chain_texture(&self, texture: TextureId) { - let mut swap_chain_outputs = self.resources.swap_chain_frames.write(); - swap_chain_outputs.remove(&texture); + fn drop_surface_frame(&self, texture: TextureId) { + let mut surface_frames = self.resources.surface_textures.write(); + surface_frames.remove(&texture); } - fn drop_all_swap_chain_textures(&self) { - let mut swap_chain_outputs = self.resources.swap_chain_frames.write(); - swap_chain_outputs.clear(); + fn drop_all_surface_frames(&self) { + let mut surface_frames = self.resources.surface_textures.write(); + for (_, (_, texture)) in surface_frames.drain() { + texture.present(); + } + + surface_frames.clear(); } fn set_asset_resource_untyped( diff --git a/crates/bevy_wgpu/src/wgpu_renderer.rs b/crates/bevy_wgpu/src/wgpu_renderer.rs index 4ed697cd33..1dcebadd39 100644 --- a/crates/bevy_wgpu/src/wgpu_renderer.rs +++ b/crates/bevy_wgpu/src/wgpu_renderer.rs @@ -24,13 +24,13 @@ pub struct WgpuRenderer { impl WgpuRenderer { pub async fn new(options: WgpuOptions) -> Self { let backend = match options.backend { - WgpuBackend::Auto => wgpu::BackendBit::PRIMARY, - WgpuBackend::Vulkan => wgpu::BackendBit::VULKAN, - WgpuBackend::Metal => wgpu::BackendBit::METAL, - WgpuBackend::Dx12 => wgpu::BackendBit::DX12, - WgpuBackend::Dx11 => wgpu::BackendBit::DX11, - WgpuBackend::Gl => wgpu::BackendBit::GL, - WgpuBackend::BrowserWgpu => wgpu::BackendBit::BROWSER_WEBGPU, + WgpuBackend::Auto => wgpu::Backends::PRIMARY, + WgpuBackend::Vulkan => wgpu::Backends::VULKAN, + WgpuBackend::Metal => wgpu::Backends::METAL, + WgpuBackend::Dx12 => wgpu::Backends::DX12, + WgpuBackend::Dx11 => wgpu::Backends::DX11, + WgpuBackend::Gl => wgpu::Backends::GL, + WgpuBackend::BrowserWgpu => wgpu::Backends::BROWSER_WEBGPU, }; let instance = wgpu::Instance::new(backend); @@ -42,6 +42,7 @@ impl WgpuRenderer { WgpuPowerOptions::LowPower => wgpu::PowerPreference::LowPower, }, compatible_surface: None, + ..Default::default() }) .await .expect("Unable to find a GPU! Make sure you have installed required drivers!"); @@ -56,12 +57,14 @@ impl WgpuRenderer { #[cfg(not(feature = "trace"))] let trace_path = None; + let adapter_limits = adapter.limits(); + let (device, queue) = adapter .request_device( &wgpu::DeviceDescriptor { label: options.device_label.as_ref().map(|a| a.as_ref()), features: options.features.wgpu_into(), - limits: options.limits.wgpu_into(), + limits: adapter_limits, }, trace_path, ) @@ -129,7 +132,7 @@ impl WgpuRenderer { let render_resource_context = world .get_resource::>() .unwrap(); - render_resource_context.drop_all_swap_chain_textures(); + render_resource_context.drop_all_surface_frames(); render_resource_context.remove_stale_bind_groups(); } } diff --git a/crates/bevy_wgpu/src/wgpu_resources.rs b/crates/bevy_wgpu/src/wgpu_resources.rs index e3e918a97a..a1ec6878ca 100644 --- a/crates/bevy_wgpu/src/wgpu_resources.rs +++ b/crates/bevy_wgpu/src/wgpu_resources.rs @@ -47,7 +47,8 @@ pub struct WgpuBindGroupInfo { pub struct WgpuResourcesReadLock<'a> { pub buffers: RwLockReadGuard<'a, HashMap>>, pub textures: RwLockReadGuard<'a, HashMap>, - pub swap_chain_frames: RwLockReadGuard<'a, HashMap>, + pub surface_textures: + RwLockReadGuard<'a, HashMap>, pub render_pipelines: RwLockReadGuard<'a, HashMap, wgpu::RenderPipeline>>, pub bind_groups: RwLockReadGuard<'a, HashMap>, @@ -59,7 +60,7 @@ impl<'a> WgpuResourcesReadLock<'a> { WgpuResourceRefs { buffers: &self.buffers, textures: &self.textures, - swap_chain_frames: &self.swap_chain_frames, + surface_textures: &self.surface_textures, render_pipelines: &self.render_pipelines, bind_groups: &self.bind_groups, used_bind_group_sender: &self.used_bind_group_sender, @@ -73,7 +74,7 @@ impl<'a> WgpuResourcesReadLock<'a> { pub struct WgpuResourceRefs<'a> { pub buffers: &'a HashMap>, pub textures: &'a HashMap, - pub swap_chain_frames: &'a HashMap, + pub surface_textures: &'a HashMap, pub render_pipelines: &'a HashMap, wgpu::RenderPipeline>, pub bind_groups: &'a HashMap, pub used_bind_group_sender: &'a Sender, @@ -84,8 +85,8 @@ pub struct WgpuResources { pub buffer_infos: Arc>>, pub texture_descriptors: Arc>>, pub window_surfaces: Arc>>, - pub window_swap_chains: Arc>>, - pub swap_chain_frames: Arc>>, + pub surface_textures: + Arc>>, pub buffers: Arc>>>, pub texture_views: Arc>>, pub textures: Arc>>, @@ -103,7 +104,7 @@ impl WgpuResources { WgpuResourcesReadLock { buffers: self.buffers.read(), textures: self.texture_views.read(), - swap_chain_frames: self.swap_chain_frames.read(), + surface_textures: self.surface_textures.read(), render_pipelines: self.render_pipelines.read(), bind_groups: self.bind_groups.read(), used_bind_group_sender: self.bind_group_counter.used_bind_group_sender.clone(), diff --git a/crates/bevy_wgpu/src/wgpu_type_converter.rs b/crates/bevy_wgpu/src/wgpu_type_converter.rs index e84f76febb..a1e72e36f6 100644 --- a/crates/bevy_wgpu/src/wgpu_type_converter.rs +++ b/crates/bevy_wgpu/src/wgpu_type_converter.rs @@ -13,7 +13,7 @@ use bevy_render::{ texture::{ AddressMode, Extent3d, FilterMode, SamplerBorderColor, SamplerDescriptor, StorageTextureAccess, TextureDescriptor, TextureDimension, TextureFormat, - TextureSampleType, TextureUsage, TextureViewDimension, + TextureSampleType, TextureUsages, TextureViewDimension, }, }; use bevy_window::Window; @@ -83,11 +83,11 @@ impl WgpuFrom<&VertexAttribute> for wgpu::VertexAttribute { } } -impl WgpuFrom for wgpu::InputStepMode { +impl WgpuFrom for wgpu::VertexStepMode { fn from(val: InputStepMode) -> Self { match val { - InputStepMode::Vertex => wgpu::InputStepMode::Vertex, - InputStepMode::Instance => wgpu::InputStepMode::Instance, + InputStepMode::Vertex => wgpu::VertexStepMode::Vertex, + InputStepMode::Instance => wgpu::VertexStepMode::Instance, } } } @@ -95,7 +95,7 @@ impl WgpuFrom for wgpu::InputStepMode { #[derive(Clone, Debug)] pub struct OwnedWgpuVertexBufferLayout { pub array_stride: wgpu::BufferAddress, - pub step_mode: wgpu::InputStepMode, + pub step_mode: wgpu::VertexStepMode, pub attributes: Vec, } @@ -137,9 +137,9 @@ impl WgpuFrom for wgpu::Color { } } -impl WgpuFrom for wgpu::BufferUsage { +impl WgpuFrom for wgpu::BufferUsages { fn from(val: BufferUsage) -> Self { - wgpu::BufferUsage::from_bits(val.bits()).unwrap() + wgpu::BufferUsages::from_bits(val.bits()).unwrap() } } @@ -190,7 +190,9 @@ impl WgpuFrom<&BindType> for wgpu::BindingType { } => wgpu::BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: *has_dynamic_offset, - min_binding_size: bind_type.get_uniform_size().and_then(wgpu::BufferSize::new), + // FIXME: The line below cause a validation error + // min_binding_size: bind_type.get_uniform_size().and_then(wgpu::BufferSize::new), + min_binding_size: None, }, BindType::StorageBuffer { has_dynamic_offset, @@ -200,7 +202,9 @@ impl WgpuFrom<&BindType> for wgpu::BindingType { read_only: *readonly, }, has_dynamic_offset: *has_dynamic_offset, - min_binding_size: bind_type.get_uniform_size().and_then(wgpu::BufferSize::new), + // FIXME: The line below cause a validation error + // min_binding_size: bind_type.get_uniform_size().and_then(wgpu::BufferSize::new), + min_binding_size: None, }, BindType::Texture { view_dimension, @@ -346,9 +350,9 @@ impl WgpuFrom for wgpu::TextureFormat { } } -impl WgpuFrom for wgpu::TextureUsage { - fn from(val: TextureUsage) -> Self { - wgpu::TextureUsage::from_bits(val.bits()).unwrap() +impl WgpuFrom for wgpu::TextureUsages { + fn from(val: TextureUsages) -> Self { + wgpu::TextureUsages::from_bits(val.bits()).unwrap() } } @@ -526,9 +530,9 @@ impl WgpuFrom for wgpu::PrimitiveState { } } -impl WgpuFrom for wgpu::ColorWrite { +impl WgpuFrom for wgpu::ColorWrites { fn from(val: ColorWrite) -> Self { - wgpu::ColorWrite::from_bits(val.bits()).unwrap() + wgpu::ColorWrites::from_bits(val.bits()).unwrap() } } @@ -640,10 +644,10 @@ impl WgpuFrom for wgpu::SamplerBorderColor { } } -impl WgpuFrom<&Window> for wgpu::SwapChainDescriptor { +impl WgpuFrom<&Window> for wgpu::SurfaceConfiguration { fn from(window: &Window) -> Self { - wgpu::SwapChainDescriptor { - usage: wgpu::TextureUsage::RENDER_ATTACHMENT, + wgpu::SurfaceConfiguration { + usage: wgpu::TextureUsages::RENDER_ATTACHMENT, format: TextureFormat::default().wgpu_into(), width: window.physical_width().max(1), height: window.physical_height().max(1), @@ -664,21 +668,12 @@ impl WgpuFrom for wgpu::Features { WgpuFeature::TimestampQuery => wgpu::Features::TIMESTAMP_QUERY, WgpuFeature::PipelineStatisticsQuery => wgpu::Features::PIPELINE_STATISTICS_QUERY, WgpuFeature::MappablePrimaryBuffers => wgpu::Features::MAPPABLE_PRIMARY_BUFFERS, - WgpuFeature::SampledTextureBindingArray => { - wgpu::Features::SAMPLED_TEXTURE_BINDING_ARRAY - } - WgpuFeature::SampledTextureArrayDynamicIndexing => { - wgpu::Features::SAMPLED_TEXTURE_ARRAY_DYNAMIC_INDEXING - } - WgpuFeature::SampledTextureArrayNonUniformIndexing => { - wgpu::Features::SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING - } WgpuFeature::UnsizedBindingArray => wgpu::Features::UNSIZED_BINDING_ARRAY, WgpuFeature::MultiDrawIndirect => wgpu::Features::MULTI_DRAW_INDIRECT, WgpuFeature::MultiDrawIndirectCount => wgpu::Features::MULTI_DRAW_INDIRECT_COUNT, WgpuFeature::PushConstants => wgpu::Features::PUSH_CONSTANTS, WgpuFeature::AddressModeClampToBorder => wgpu::Features::ADDRESS_MODE_CLAMP_TO_BORDER, - WgpuFeature::NonFillPolygonMode => wgpu::Features::NON_FILL_POLYGON_MODE, + WgpuFeature::PolygonModeLine => wgpu::Features::POLYGON_MODE_LINE, WgpuFeature::TextureCompressionEtc2 => wgpu::Features::TEXTURE_COMPRESSION_ETC2, WgpuFeature::TextureCompressionAstcLdr => wgpu::Features::TEXTURE_COMPRESSION_ASTC_LDR, WgpuFeature::TextureAdapterSpecificFormatFeatures => { @@ -724,6 +719,8 @@ impl WgpuFrom for wgpu::Limits { max_vertex_buffers: val.max_vertex_buffers, max_vertex_attributes: val.max_vertex_attributes, max_vertex_buffer_array_stride: val.max_vertex_buffer_array_stride, + min_storage_buffer_offset_alignment: val.min_storage_buffer_offset_alignment, + min_uniform_buffer_offset_alignment: val.min_uniform_buffer_offset_alignment, } } } diff --git a/examples/3d/render_to_texture.rs b/examples/3d/render_to_texture.rs index 1cb34f27fa..e0a6a0b91d 100644 --- a/examples/3d/render_to_texture.rs +++ b/examples/3d/render_to_texture.rs @@ -13,7 +13,7 @@ use bevy::{ }, texture::{ Extent3d, SamplerDescriptor, TextureDescriptor, TextureDimension, TextureFormat, - TextureUsage, + TextureUsages, }, }, window::WindowId, @@ -65,7 +65,7 @@ fn add_render_to_texture_graph(graph: &mut RenderGraph, size: Extent3d) { sample_count: 1, dimension: TextureDimension::D2, format: Default::default(), - usage: TextureUsage::OUTPUT_ATTACHMENT | TextureUsage::SAMPLED, + usage: TextureUsages::OUTPUT_ATTACHMENT | TextureUsages::SAMPLED, }, Some(SamplerDescriptor::default()), Some(RENDER_TEXTURE_HANDLE), @@ -81,7 +81,7 @@ fn add_render_to_texture_graph(graph: &mut RenderGraph, size: Extent3d) { sample_count: 1, dimension: TextureDimension::D2, format: TextureFormat::Depth32Float, - usage: TextureUsage::OUTPUT_ATTACHMENT | TextureUsage::SAMPLED, + usage: TextureUsages::OUTPUT_ATTACHMENT | TextureUsages::SAMPLED, }, None, None, diff --git a/examples/3d/wireframe.rs b/examples/3d/wireframe.rs index c07483cfb2..4cc291ac18 100644 --- a/examples/3d/wireframe.rs +++ b/examples/3d/wireframe.rs @@ -10,7 +10,7 @@ fn main() { .insert_resource(WgpuOptions { features: WgpuFeatures { // The Wireframe requires NonFillPolygonMode feature - features: vec![WgpuFeature::NonFillPolygonMode], + features: vec![WgpuFeature::PolygonModeLine], }, ..Default::default() }) diff --git a/examples/shader/custom_shader_pipelined.rs b/examples/shader/custom_shader_pipelined.rs index 9fb9d118e4..696f2371a4 100644 --- a/examples/shader/custom_shader_pipelined.rs +++ b/examples/shader/custom_shader_pipelined.rs @@ -57,7 +57,7 @@ impl RenderAsset for CustomMaterial { let buffer = render_device.create_buffer_with_data(&BufferInitDescriptor { contents: color.as_std140().as_bytes(), label: None, - usage: BufferUsage::UNIFORM | BufferUsage::COPY_DST, + usage: BufferUsages::UNIFORM | BufferUsages::COPY_DST, }); let bind_group = render_device.create_bind_group(&BindGroupDescriptor { entries: &[BindGroupEntry { @@ -136,7 +136,7 @@ impl FromWorld for CustomPipeline { let material_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { entries: &[BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: false, @@ -163,7 +163,7 @@ impl FromWorld for CustomPipeline { vertex: VertexState { buffers: &[VertexBufferLayout { array_stride: 32, - step_mode: InputStepMode::Vertex, + step_mode: VertexStepMode::Vertex, attributes: &[ // Position (GOTCHA! Vertex_Position isn't first in the buffer due to how Mesh sorts attributes (alphabetically)) VertexAttribute { @@ -205,7 +205,7 @@ impl FromWorld for CustomPipeline { operation: BlendOperation::Add, }, }), - write_mask: ColorWrite::ALL, + write_mask: ColorWrites::ALL, }], }), depth_stencil: Some(DepthStencilState { diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs index 57c1e2f824..d8959a64a9 100644 --- a/examples/window/multiple_windows.rs +++ b/examples/window/multiple_windows.rs @@ -7,7 +7,7 @@ use bevy::{ base::MainPass, CameraNode, PassNode, RenderGraph, WindowSwapChainNode, WindowTextureNode, }, - texture::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsage}, + texture::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages}, }, window::{CreateWindow, WindowDescriptor, WindowId}, }; @@ -88,7 +88,7 @@ fn setup_pipeline( window_id, TextureDescriptor { format: TextureFormat::Depth32Float, - usage: TextureUsage::OUTPUT_ATTACHMENT, + usage: TextureUsages::OUTPUT_ATTACHMENT, sample_count: msaa.samples, ..Default::default() }, @@ -165,7 +165,7 @@ fn setup_pipeline( sample_count: msaa.samples, dimension: TextureDimension::D2, format: TextureFormat::default(), - usage: TextureUsage::OUTPUT_ATTACHMENT, + usage: TextureUsages::OUTPUT_ATTACHMENT, }, ), ); diff --git a/pipelined/bevy_core_pipeline/src/lib.rs b/pipelined/bevy_core_pipeline/src/lib.rs index cff774108a..9f45bfd188 100644 --- a/pipelined/bevy_core_pipeline/src/lib.rs +++ b/pipelined/bevy_core_pipeline/src/lib.rs @@ -246,7 +246,7 @@ pub fn prepare_core_views_system( dimension: TextureDimension::D2, format: TextureFormat::Depth32Float, /* PERF: vulkan docs recommend using 24 * bit depth for better performance */ - usage: TextureUsage::RENDER_ATTACHMENT, + usage: TextureUsages::RENDER_ATTACHMENT, }, ); commands.entity(entity).insert(ViewDepthTexture { diff --git a/pipelined/bevy_core_pipeline/src/main_pass_driver.rs b/pipelined/bevy_core_pipeline/src/main_pass_driver.rs index 2e0736c3fe..6744f8273e 100644 --- a/pipelined/bevy_core_pipeline/src/main_pass_driver.rs +++ b/pipelined/bevy_core_pipeline/src/main_pass_driver.rs @@ -22,7 +22,11 @@ impl Node for MainPassDriverNode { if let Some(camera_2d) = extracted_cameras.entities.get(CameraPlugin::CAMERA_2D) { let extracted_camera = world.entity(*camera_2d).get::().unwrap(); let extracted_window = extracted_windows.get(&extracted_camera.window_id).unwrap(); - let swap_chain_texture = extracted_window.swap_chain_frame.as_ref().unwrap().clone(); + let swap_chain_texture = extracted_window + .swap_chain_texture + .as_ref() + .unwrap() + .clone(); graph.run_sub_graph( crate::draw_2d_graph::NAME, vec![ @@ -36,7 +40,11 @@ impl Node for MainPassDriverNode { let extracted_camera = world.entity(*camera_3d).get::().unwrap(); let depth_texture = world.entity(*camera_3d).get::().unwrap(); let extracted_window = extracted_windows.get(&extracted_camera.window_id).unwrap(); - let swap_chain_texture = extracted_window.swap_chain_frame.as_ref().unwrap().clone(); + let swap_chain_texture = extracted_window + .swap_chain_texture + .as_ref() + .unwrap() + .clone(); graph.run_sub_graph( crate::draw_3d_graph::NAME, vec![ diff --git a/pipelined/bevy_gltf2/Cargo.toml b/pipelined/bevy_gltf2/Cargo.toml index dbc9ee761a..a5efe4753b 100644 --- a/pipelined/bevy_gltf2/Cargo.toml +++ b/pipelined/bevy_gltf2/Cargo.toml @@ -32,4 +32,4 @@ thiserror = "1.0" anyhow = "1.0.4" base64 = "0.13.0" percent-encoding = "2.1" -wgpu = "0.9" +wgpu = "0.11.0" diff --git a/pipelined/bevy_pbr2/Cargo.toml b/pipelined/bevy_pbr2/Cargo.toml index 5f7f4e47b2..21bf192169 100644 --- a/pipelined/bevy_pbr2/Cargo.toml +++ b/pipelined/bevy_pbr2/Cargo.toml @@ -30,4 +30,4 @@ bitflags = "1.2" # direct dependency required for derive macro bytemuck = { version = "1", features = ["derive"] } crevice = { path = "../../crates/crevice", version = "0.6.0" } -wgpu = "0.9" +wgpu = { version = "0.11.0", features = ["spirv"] } diff --git a/pipelined/bevy_pbr2/src/material.rs b/pipelined/bevy_pbr2/src/material.rs index 913ac41f6a..010e636d7d 100644 --- a/pipelined/bevy_pbr2/src/material.rs +++ b/pipelined/bevy_pbr2/src/material.rs @@ -6,7 +6,9 @@ use bevy_reflect::TypeUuid; use bevy_render2::{ color::Color, render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets}, - render_resource::{BindGroup, Buffer, BufferInitDescriptor, BufferUsage, Sampler, TextureView}, + render_resource::{ + BindGroup, Buffer, BufferInitDescriptor, BufferUsages, Sampler, TextureView, + }, renderer::RenderDevice, texture::Image, }; @@ -222,7 +224,7 @@ impl RenderAsset for StandardMaterial { let buffer = render_device.create_buffer_with_data(&BufferInitDescriptor { label: Some("pbr_standard_material_uniform_buffer"), - usage: BufferUsage::UNIFORM | BufferUsage::COPY_DST, + usage: BufferUsages::UNIFORM | BufferUsages::COPY_DST, contents: value_std140.as_bytes(), }); let bind_group = render_device.create_bind_group(&BindGroupDescriptor { diff --git a/pipelined/bevy_pbr2/src/render/depth.wgsl b/pipelined/bevy_pbr2/src/render/depth.wgsl index 35e66e26bf..86feff1801 100644 --- a/pipelined/bevy_pbr2/src/render/depth.wgsl +++ b/pipelined/bevy_pbr2/src/render/depth.wgsl @@ -6,7 +6,7 @@ struct View { world_position: vec3; }; [[group(0), binding(0)]] -var view: View; +var view: View; [[block]] @@ -18,7 +18,7 @@ struct Mesh { }; [[group(1), binding(0)]] -var mesh: Mesh; +var mesh: Mesh; struct Vertex { [[location(0)]] position: vec3; diff --git a/pipelined/bevy_pbr2/src/render/light.rs b/pipelined/bevy_pbr2/src/render/light.rs index ad594df2f9..7cb4a2c22b 100644 --- a/pipelined/bevy_pbr2/src/render/light.rs +++ b/pipelined/bevy_pbr2/src/render/light.rs @@ -122,7 +122,7 @@ impl FromWorld for ShadowShaders { // View BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::VERTEX | ShaderStage::FRAGMENT, + visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, @@ -147,7 +147,7 @@ impl FromWorld for ShadowShaders { vertex: VertexState { buffers: &[VertexBufferLayout { array_stride: 32, - step_mode: InputStepMode::Vertex, + step_mode: VertexStepMode::Vertex, attributes: &[ // Position (GOTCHA! Vertex_Position isn't first in the buffer due to how Mesh sorts attributes (alphabetically)) VertexAttribute { @@ -411,8 +411,8 @@ pub fn prepare_lights( sample_count: 1, dimension: TextureDimension::D2, format: SHADOW_FORMAT, - usage: TextureUsage::RENDER_ATTACHMENT | TextureUsage::SAMPLED, label: Some("point_light_shadow_map_texture"), + usage: TextureUsages::RENDER_ATTACHMENT | TextureUsages::TEXTURE_BINDING, }, ); let directional_light_depth_texture = texture_cache.get( @@ -427,8 +427,8 @@ pub fn prepare_lights( sample_count: 1, dimension: TextureDimension::D2, format: SHADOW_FORMAT, - usage: TextureUsage::RENDER_ATTACHMENT | TextureUsage::SAMPLED, label: Some("directional_light_shadow_map_texture"), + usage: TextureUsages::RENDER_ATTACHMENT | TextureUsages::TEXTURE_BINDING, }, ); let mut view_lights = Vec::new(); diff --git a/pipelined/bevy_pbr2/src/render/mod.rs b/pipelined/bevy_pbr2/src/render/mod.rs index e765bc72db..0999f15721 100644 --- a/pipelined/bevy_pbr2/src/render/mod.rs +++ b/pipelined/bevy_pbr2/src/render/mod.rs @@ -136,7 +136,7 @@ impl FromWorld for PbrShaders { // View BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::VERTEX | ShaderStage::FRAGMENT, + visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, @@ -149,7 +149,7 @@ impl FromWorld for PbrShaders { // Lights BindGroupLayoutEntry { binding: 1, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, @@ -162,7 +162,7 @@ impl FromWorld for PbrShaders { // Point Shadow Texture Cube Array BindGroupLayoutEntry { binding: 2, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Depth, @@ -173,7 +173,7 @@ impl FromWorld for PbrShaders { // Point Shadow Texture Array Sampler BindGroupLayoutEntry { binding: 3, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: true, filtering: true, @@ -183,7 +183,7 @@ impl FromWorld for PbrShaders { // Directional Shadow Texture Array BindGroupLayoutEntry { binding: 4, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Depth, @@ -194,7 +194,7 @@ impl FromWorld for PbrShaders { // Directional Shadow Texture Array Sampler BindGroupLayoutEntry { binding: 5, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: true, filtering: true, @@ -209,7 +209,7 @@ impl FromWorld for PbrShaders { entries: &[ BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: false, @@ -222,7 +222,7 @@ impl FromWorld for PbrShaders { // Base Color Texture BindGroupLayoutEntry { binding: 1, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Float { filterable: true }, @@ -233,7 +233,7 @@ impl FromWorld for PbrShaders { // Base Color Texture Sampler BindGroupLayoutEntry { binding: 2, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: false, filtering: true, @@ -243,7 +243,7 @@ impl FromWorld for PbrShaders { // Emissive Texture BindGroupLayoutEntry { binding: 3, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Float { filterable: true }, @@ -254,7 +254,7 @@ impl FromWorld for PbrShaders { // Emissive Texture Sampler BindGroupLayoutEntry { binding: 4, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: false, filtering: true, @@ -264,7 +264,7 @@ impl FromWorld for PbrShaders { // Metallic Roughness Texture BindGroupLayoutEntry { binding: 5, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Float { filterable: true }, @@ -275,7 +275,7 @@ impl FromWorld for PbrShaders { // Metallic Roughness Texture Sampler BindGroupLayoutEntry { binding: 6, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: false, filtering: true, @@ -285,7 +285,7 @@ impl FromWorld for PbrShaders { // Occlusion Texture BindGroupLayoutEntry { binding: 7, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Float { filterable: true }, @@ -296,7 +296,7 @@ impl FromWorld for PbrShaders { // Occlusion Texture Sampler BindGroupLayoutEntry { binding: 8, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: false, filtering: true, @@ -310,7 +310,7 @@ impl FromWorld for PbrShaders { let mesh_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { entries: &[BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::VERTEX | ShaderStage::FRAGMENT, + visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, @@ -334,7 +334,7 @@ impl FromWorld for PbrShaders { vertex: VertexState { buffers: &[VertexBufferLayout { array_stride: 32, - step_mode: InputStepMode::Vertex, + step_mode: VertexStepMode::Vertex, attributes: &[ // Position (GOTCHA! Vertex_Position isn't first in the buffer due to how Mesh sorts attributes (alphabetically)) VertexAttribute { @@ -376,7 +376,7 @@ impl FromWorld for PbrShaders { operation: BlendOperation::Add, }, }), - write_mask: ColorWrite::ALL, + write_mask: ColorWrites::ALL, }], }), depth_stencil: Some(DepthStencilState { @@ -426,6 +426,7 @@ impl FromWorld for PbrShaders { texture: &texture, mip_level: 0, origin: Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, }, &image.data, ImageDataLayout { diff --git a/pipelined/bevy_pbr2/src/render/pbr.wgsl b/pipelined/bevy_pbr2/src/render/pbr.wgsl index 1528cca4d2..06e3920498 100644 --- a/pipelined/bevy_pbr2/src/render/pbr.wgsl +++ b/pipelined/bevy_pbr2/src/render/pbr.wgsl @@ -18,9 +18,9 @@ struct Mesh { let MESH_FLAGS_SHADOW_RECEIVER_BIT: u32 = 1u; [[group(0), binding(0)]] -var view: View; +var view: View; [[group(2), binding(0)]] -var mesh: Mesh; +var mesh: Mesh; struct Vertex { [[location(0)]] position: vec3; @@ -136,7 +136,7 @@ struct Lights { [[group(0), binding(1)]] -var lights: Lights; +var lights: Lights; [[group(0), binding(2)]] var point_shadow_textures: texture_depth_cube_array; [[group(0), binding(3)]] @@ -147,7 +147,7 @@ var directional_shadow_textures: texture_depth_2d_array; var directional_shadow_textures_sampler: sampler_comparison; [[group(1), binding(0)]] -var material: StandardMaterial; +var material: StandardMaterial; [[group(1), binding(1)]] var base_color_texture: texture_2d; [[group(1), binding(2)]] @@ -293,7 +293,7 @@ fn reinhard(color: vec3) -> vec3 { } fn reinhard_extended(color: vec3, max_white: f32) -> vec3 { - let numerator = color * (1.0f + (color / vec3(max_white * max_white))); + let numerator = color * (1.0 + (color / vec3(max_white * max_white))); return numerator / (1.0 + color); } @@ -310,14 +310,14 @@ fn change_luminance(c_in: vec3, l_out: f32) -> vec3 { fn reinhard_luminance(color: vec3) -> vec3 { let l_old = luminance(color); - let l_new = l_old / (1.0f + l_old); + let l_new = l_old / (1.0 + l_old); return change_luminance(color, l_new); } fn reinhard_extended_luminance(color: vec3, max_white_l: f32) -> vec3 { let l_old = luminance(color); - let numerator = l_old * (1.0f + (l_old / (max_white_l * max_white_l))); - let l_new = numerator / (1.0f + l_old); + let numerator = l_old * (1.0 + (l_old / (max_white_l * max_white_l))); + let l_new = numerator / (1.0 + l_old); return change_luminance(color, l_new); } diff --git a/pipelined/bevy_render2/Cargo.toml b/pipelined/bevy_render2/Cargo.toml index 716a1b3ad3..a1bb1fbc66 100644 --- a/pipelined/bevy_render2/Cargo.toml +++ b/pipelined/bevy_render2/Cargo.toml @@ -29,8 +29,8 @@ bevy_utils = { path = "../../crates/bevy_utils", version = "0.5.0" } image = { version = "0.23.12", default-features = false } # misc -wgpu = "0.9" -naga = { version = "0.5", features = ["glsl-in", "spv-in", "spv-out", "wgsl-in", "wgsl-out"] } +wgpu = { version = "0.11.0", features = ["spirv"] } +naga = { version = "0.7.0", features = ["glsl-in", "spv-in", "spv-out", "wgsl-in", "wgsl-out"] } serde = { version = "1", features = ["derive"] } bitflags = "1.2.1" smallvec = { version = "1.6", features = ["union", "const_generics"] } diff --git a/pipelined/bevy_render2/src/lib.rs b/pipelined/bevy_render2/src/lib.rs index df198eee20..ce28144d00 100644 --- a/pipelined/bevy_render2/src/lib.rs +++ b/pipelined/bevy_render2/src/lib.rs @@ -25,7 +25,7 @@ use bevy_app::{App, AppLabel, Plugin}; use bevy_asset::AssetServer; use bevy_ecs::prelude::*; use std::ops::{Deref, DerefMut}; -use wgpu::BackendBit; +use wgpu::Backends; #[derive(Default)] pub struct RenderPlugin; @@ -86,7 +86,7 @@ impl Plugin for RenderPlugin { fn build(&self, app: &mut App) { let (instance, device, queue) = futures_lite::future::block_on(renderer::initialize_renderer( - BackendBit::PRIMARY, + wgpu::util::backend_bits_from_env().unwrap_or(Backends::PRIMARY), &wgpu::RequestAdapterOptions { power_preference: wgpu::PowerPreference::HighPerformance, ..Default::default() diff --git a/pipelined/bevy_render2/src/mesh/mesh/mod.rs b/pipelined/bevy_render2/src/mesh/mesh/mod.rs index 4c2caa9c4d..ae2da3f66c 100644 --- a/pipelined/bevy_render2/src/mesh/mesh/mod.rs +++ b/pipelined/bevy_render2/src/mesh/mesh/mod.rs @@ -11,7 +11,9 @@ use bevy_math::*; use bevy_reflect::TypeUuid; use bevy_utils::EnumVariantMeta; use std::{borrow::Cow, collections::BTreeMap}; -use wgpu::{util::BufferInitDescriptor, BufferUsage, IndexFormat, PrimitiveTopology, VertexFormat}; +use wgpu::{ + util::BufferInitDescriptor, BufferUsages, IndexFormat, PrimitiveTopology, VertexFormat, +}; pub const INDEX_BUFFER_ASSET_INDEX: u64 = 0; pub const VERTEX_ATTRIBUTE_BUFFER_ID: u64 = 10; @@ -553,14 +555,14 @@ impl RenderAsset for Mesh { ) -> Result> { let vertex_buffer_data = mesh.get_vertex_buffer_data(); let vertex_buffer = render_device.create_buffer_with_data(&BufferInitDescriptor { - usage: BufferUsage::VERTEX, + usage: BufferUsages::VERTEX, label: None, contents: &vertex_buffer_data, }); let index_info = mesh.get_index_buffer_bytes().map(|data| GpuIndexInfo { buffer: render_device.create_buffer_with_data(&BufferInitDescriptor { - usage: BufferUsage::INDEX, + usage: BufferUsages::INDEX, contents: data, label: None, }), diff --git a/pipelined/bevy_render2/src/render_resource/buffer_vec.rs b/pipelined/bevy_render2/src/render_resource/buffer_vec.rs index 12056c2961..2094d749df 100644 --- a/pipelined/bevy_render2/src/render_resource/buffer_vec.rs +++ b/pipelined/bevy_render2/src/render_resource/buffer_vec.rs @@ -3,14 +3,14 @@ use crate::{ renderer::{RenderDevice, RenderQueue}, }; use bevy_core::{cast_slice, Pod}; -use wgpu::BufferUsage; +use wgpu::BufferUsages; pub struct BufferVec { values: Vec, buffer: Option, capacity: usize, item_size: usize, - buffer_usage: BufferUsage, + buffer_usage: BufferUsages, } impl Default for BufferVec { @@ -19,14 +19,14 @@ impl Default for BufferVec { values: Vec::new(), buffer: None, capacity: 0, - buffer_usage: BufferUsage::all(), + buffer_usage: BufferUsages::all(), item_size: std::mem::size_of::(), } } } impl BufferVec { - pub fn new(buffer_usage: BufferUsage) -> Self { + pub fn new(buffer_usage: BufferUsages) -> Self { Self { buffer_usage, ..Default::default() @@ -63,7 +63,7 @@ impl BufferVec { self.buffer = Some(device.create_buffer(&wgpu::BufferDescriptor { label: None, size: size as wgpu::BufferAddress, - usage: BufferUsage::COPY_DST | self.buffer_usage, + usage: BufferUsages::COPY_DST | self.buffer_usage, mapped_at_creation: false, })); } diff --git a/pipelined/bevy_render2/src/render_resource/mod.rs b/pipelined/bevy_render2/src/render_resource/mod.rs index 858052e3b9..1bedc830dc 100644 --- a/pipelined/bevy_render2/src/render_resource/mod.rs +++ b/pipelined/bevy_render2/src/render_resource/mod.rs @@ -17,14 +17,14 @@ pub use wgpu::{ util::BufferInitDescriptor, AddressMode, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource, BindingType, BlendComponent, BlendFactor, BlendOperation, BlendState, BufferAddress, BufferBindingType, BufferSize, - BufferUsage, ColorTargetState, ColorWrite, CompareFunction, ComputePassDescriptor, + BufferUsages, ColorTargetState, ColorWrites, CompareFunction, ComputePassDescriptor, ComputePipelineDescriptor, DepthBiasState, DepthStencilState, Extent3d, Face, FilterMode, - FragmentState, FrontFace, IndexFormat, InputStepMode, LoadOp, MultisampleState, Operations, - PipelineLayout, PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, + FragmentState, FrontFace, IndexFormat, LoadOp, MultisampleState, Operations, PipelineLayout, + PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPassColorAttachment, RenderPassDepthStencilAttachment, RenderPassDescriptor, - RenderPipelineDescriptor, SamplerDescriptor, ShaderFlags, ShaderModule, ShaderModuleDescriptor, - ShaderSource, ShaderStage, StencilFaceState, StencilOperation, StencilState, + RenderPipelineDescriptor, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, + ShaderSource, ShaderStages, StencilFaceState, StencilOperation, StencilState, StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, TextureFormat, - TextureSampleType, TextureUsage, TextureViewDescriptor, TextureViewDimension, VertexAttribute, - VertexBufferLayout, VertexFormat, VertexState, + TextureSampleType, TextureUsages, TextureViewDescriptor, TextureViewDimension, VertexAttribute, + VertexBufferLayout, VertexFormat, VertexState, VertexStepMode, }; diff --git a/pipelined/bevy_render2/src/render_resource/texture.rs b/pipelined/bevy_render2/src/render_resource/texture.rs index 39d290bb2c..6baac16a17 100644 --- a/pipelined/bevy_render2/src/render_resource/texture.rs +++ b/pipelined/bevy_render2/src/render_resource/texture.rs @@ -45,7 +45,12 @@ pub struct TextureViewId(Uuid); #[derive(Clone, Debug)] pub enum TextureViewValue { TextureView(Arc), - SwapChainFrame(Arc), + SurfaceTexture { + // NOTE: The order of these fields is important because the view must be dropped before the + // frame is dropped + view: Arc, + texture: Arc, + }, } #[derive(Clone, Debug)] @@ -59,6 +64,14 @@ impl TextureView { pub fn id(&self) -> TextureViewId { self.id } + + #[inline] + pub fn take_surface_texture(self) -> Option { + match self.value { + TextureViewValue::TextureView(_) => None, + TextureViewValue::SurfaceTexture { texture, .. } => Arc::try_unwrap(texture).ok(), + } + } } impl From for TextureView { @@ -70,11 +83,14 @@ impl From for TextureView { } } -impl From for TextureView { - fn from(value: wgpu::SwapChainFrame) -> Self { +impl From for TextureView { + fn from(value: wgpu::SurfaceTexture) -> Self { + let texture = Arc::new(value); + let view = Arc::new(texture.texture.create_view(&Default::default())); + TextureView { id: TextureViewId(Uuid::new_v4()), - value: TextureViewValue::SwapChainFrame(Arc::new(value)), + value: TextureViewValue::SurfaceTexture { texture, view }, } } } @@ -86,7 +102,7 @@ impl Deref for TextureView { fn deref(&self) -> &Self::Target { match &self.value { TextureViewValue::TextureView(value) => value, - TextureViewValue::SwapChainFrame(value) => &value.output.view, + TextureViewValue::SurfaceTexture { view, .. } => view, } } } diff --git a/pipelined/bevy_render2/src/render_resource/uniform_vec.rs b/pipelined/bevy_render2/src/render_resource/uniform_vec.rs index 1d66585146..569db08f07 100644 --- a/pipelined/bevy_render2/src/render_resource/uniform_vec.rs +++ b/pipelined/bevy_render2/src/render_resource/uniform_vec.rs @@ -4,7 +4,7 @@ use crate::{ }; use crevice::std140::{self, AsStd140, DynamicUniform, Std140}; use std::num::NonZeroU64; -use wgpu::{BindingResource, BufferBinding, BufferDescriptor, BufferUsage}; +use wgpu::{BindingResource, BufferBinding, BufferDescriptor, BufferUsages}; pub struct UniformVec { values: Vec, @@ -78,7 +78,7 @@ impl UniformVec { self.uniform_buffer = Some(device.create_buffer(&BufferDescriptor { label: None, size: size as wgpu::BufferAddress, - usage: BufferUsage::COPY_DST | BufferUsage::UNIFORM, + usage: BufferUsages::COPY_DST | BufferUsages::UNIFORM, mapped_at_creation: false, })); } diff --git a/pipelined/bevy_render2/src/renderer/mod.rs b/pipelined/bevy_render2/src/renderer/mod.rs index 91bb42a08b..840faed624 100644 --- a/pipelined/bevy_render2/src/renderer/mod.rs +++ b/pipelined/bevy_render2/src/renderer/mod.rs @@ -1,14 +1,14 @@ mod graph_runner; mod render_device; -use bevy_utils::tracing::info; +use bevy_utils::tracing::{info, info_span}; pub use graph_runner::*; pub use render_device::*; -use crate::render_graph::RenderGraph; +use crate::{render_graph::RenderGraph, view::ExtractedWindows}; use bevy_ecs::prelude::*; use std::sync::Arc; -use wgpu::{BackendBit, CommandEncoder, DeviceDescriptor, Instance, Queue, RequestAdapterOptions}; +use wgpu::{Backends, CommandEncoder, DeviceDescriptor, Instance, Queue, RequestAdapterOptions}; pub fn render_system(world: &mut World) { world.resource_scope(|world, mut graph: Mut| { @@ -24,13 +24,25 @@ pub fn render_system(world: &mut World) { world, ) .unwrap(); + { + let span = info_span!("present_frames"); + let _guard = span.enter(); + let mut windows = world.get_resource_mut::().unwrap(); + for window in windows.values_mut() { + if let Some(texture_view) = window.swap_chain_texture.take() { + if let Some(surface_texture) = texture_view.take_surface_texture() { + surface_texture.present(); + } + } + } + } } pub type RenderQueue = Arc; pub type RenderInstance = Instance; pub async fn initialize_renderer( - backends: BackendBit, + backends: Backends, request_adapter_options: &RequestAdapterOptions<'_>, device_descriptor: &DeviceDescriptor<'_>, ) -> (RenderInstance, RenderDevice, RenderQueue) { diff --git a/pipelined/bevy_render2/src/renderer/render_device.rs b/pipelined/bevy_render2/src/renderer/render_device.rs index 2cb437c122..118b1a8a4d 100644 --- a/pipelined/bevy_render2/src/renderer/render_device.rs +++ b/pipelined/bevy_render2/src/renderer/render_device.rs @@ -145,12 +145,8 @@ impl RenderDevice { /// /// - A old [`SwapChainFrame`] is still alive referencing an old swapchain. /// - Texture format requested is unsupported on the swap chain. - pub fn create_swap_chain( - &self, - surface: &wgpu::Surface, - desc: &wgpu::SwapChainDescriptor, - ) -> wgpu::SwapChain { - self.device.create_swap_chain(surface, desc) + pub fn configure_surface(&self, surface: &wgpu::Surface, config: &wgpu::SurfaceConfiguration) { + surface.configure(&self.device, config) } pub fn wgpu_device(&self) -> &wgpu::Device { diff --git a/pipelined/bevy_render2/src/shader/shader.rs b/pipelined/bevy_render2/src/shader/shader.rs index ace300da63..6b3e52fce4 100644 --- a/pipelined/bevy_render2/src/shader/shader.rs +++ b/pipelined/bevy_render2/src/shader/shader.rs @@ -1,10 +1,10 @@ use bevy_asset::{AssetLoader, LoadContext, LoadedAsset}; use bevy_reflect::{TypeUuid, Uuid}; use bevy_utils::{tracing::error, BoxedFuture}; -use naga::{valid::ModuleInfo, Module, ShaderStage}; -use std::{borrow::Cow, collections::HashMap, marker::Copy}; +use naga::{valid::ModuleInfo, Module}; +use std::{borrow::Cow, marker::Copy}; use thiserror::Error; -use wgpu::{ShaderFlags, ShaderModuleDescriptor, ShaderSource}; +use wgpu::{ShaderModuleDescriptor, ShaderSource}; #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)] pub struct ShaderId(Uuid); @@ -20,8 +20,8 @@ impl ShaderId { pub enum ShaderReflectError { #[error(transparent)] WgslParse(#[from] naga::front::wgsl::ParseError), - #[error(transparent)] - GlslParse(#[from] naga::front::glsl::ParseError), + #[error("GLSL Parse Error: {0:?}")] + GlslParse(Vec), #[error(transparent)] SpirVParse(#[from] naga::front::spv::Error), #[error(transparent)] @@ -33,7 +33,7 @@ pub enum ShaderReflectError { #[uuid = "d95bc916-6c55-4de3-9622-37e7b6969fda"] pub enum Shader { Wgsl(Cow<'static, str>), - Glsl(Cow<'static, str>), + Glsl(Cow<'static, str>, naga::ShaderStage), SpirV(Vec), // TODO: consider the following // PrecompiledSpirVMacros(HashMap, Vec>) @@ -54,6 +54,7 @@ impl ShaderReflection { flags: naga::back::spv::WriterFlags::empty(), ..naga::back::spv::Options::default() }, + None, ) } @@ -67,17 +68,11 @@ impl Shader { let module = match &self { // TODO: process macros here Shader::Wgsl(source) => naga::front::wgsl::parse_str(source)?, - Shader::Glsl(source) => { - let mut entry_points = HashMap::default(); - entry_points.insert("vertex".to_string(), ShaderStage::Vertex); - entry_points.insert("fragment".to_string(), ShaderStage::Fragment); - naga::front::glsl::parse_str( - source, - &naga::front::glsl::Options { - entry_points, - defines: Default::default(), - }, - )? + Shader::Glsl(source, shader_stage) => { + let mut parser = naga::front::glsl::Parser::default(); + parser + .parse(&naga::front::glsl::Options::from(*shader_stage), source) + .map_err(ShaderReflectError::GlslParse)? } Shader::SpirV(source) => naga::front::spv::parse_u8_slice( source, @@ -103,8 +98,8 @@ impl Shader { Shader::Wgsl(source.into()) } - pub fn from_glsl(source: impl Into>) -> Shader { - Shader::Glsl(source.into()) + pub fn from_glsl(source: impl Into>, stage: naga::ShaderStage) -> Shader { + Shader::Glsl(source.into(), stage) } pub fn from_spirv(source: Vec) -> Shader { @@ -143,11 +138,10 @@ impl AssetLoader for ShaderLoader { impl<'a> From<&'a Shader> for ShaderModuleDescriptor<'a> { fn from(shader: &'a Shader) -> Self { ShaderModuleDescriptor { - flags: ShaderFlags::default(), label: None, source: match shader { Shader::Wgsl(source) => ShaderSource::Wgsl(source.clone()), - Shader::Glsl(_source) => { + Shader::Glsl(_source, _stage) => { let reflection = shader.reflect().unwrap(); let wgsl = reflection.get_wgsl().unwrap(); ShaderSource::Wgsl(wgsl.into()) diff --git a/pipelined/bevy_render2/src/texture/image.rs b/pipelined/bevy_render2/src/texture/image.rs index 1be9671c92..270a0824fc 100644 --- a/pipelined/bevy_render2/src/texture/image.rs +++ b/pipelined/bevy_render2/src/texture/image.rs @@ -42,7 +42,7 @@ impl Default for Image { label: None, mip_level_count: 1, sample_count: 1, - usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, }, sampler_descriptor: wgpu::SamplerDescriptor::default(), } @@ -369,6 +369,7 @@ impl RenderAsset for Image { texture: &texture, mip_level: 0, origin: Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, }, &image.data, ImageDataLayout { diff --git a/pipelined/bevy_render2/src/view/window.rs b/pipelined/bevy_render2/src/view/window.rs index 82d5bc6047..6d338f7854 100644 --- a/pipelined/bevy_render2/src/view/window.rs +++ b/pipelined/bevy_render2/src/view/window.rs @@ -6,7 +6,7 @@ use crate::{ }; use bevy_app::{App, Plugin}; use bevy_ecs::prelude::*; -use bevy_utils::{tracing::debug, HashMap}; +use bevy_utils::{tracing::debug, HashMap, HashSet}; use bevy_window::{RawWindowHandleWrapper, WindowId, Windows}; use std::ops::{Deref, DerefMut}; use wgpu::TextureFormat; @@ -34,7 +34,7 @@ pub struct ExtractedWindow { pub physical_width: u32, pub physical_height: u32, pub vsync: bool, - pub swap_chain_frame: Option, + pub swap_chain_texture: Option, pub size_changed: bool, } @@ -74,12 +74,12 @@ fn extract_windows(mut render_world: ResMut, windows: Res) physical_width: new_width, physical_height: new_height, vsync: window.vsync(), - swap_chain_frame: None, + swap_chain_texture: None, size_changed: false, }); // NOTE: Drop the swap chain frame here - extracted_window.swap_chain_frame = None; + extracted_window.swap_chain_texture = None; extracted_window.size_changed = new_width != extracted_window.physical_width || new_height != extracted_window.physical_height; @@ -100,7 +100,8 @@ fn extract_windows(mut render_world: ResMut, windows: Res) #[derive(Default)] pub struct WindowSurfaces { surfaces: HashMap, - swap_chains: HashMap, + /// List of windows that we have already called the initial `configure_surface` for + configured_windows: HashSet, } pub fn prepare_windows( @@ -122,11 +123,11 @@ pub fn prepare_windows( render_instance.create_surface(&window.handle.get_handle()) }); - let swap_chain_descriptor = wgpu::SwapChainDescriptor { + let swap_chain_descriptor = wgpu::SurfaceConfiguration { format: TextureFormat::bevy_default(), width: window.physical_width, height: window.physical_height, - usage: wgpu::TextureUsage::RENDER_ATTACHMENT, + usage: wgpu::TextureUsages::RENDER_ATTACHMENT, present_mode: if window.vsync { wgpu::PresentMode::Fifo } else { @@ -134,34 +135,22 @@ pub fn prepare_windows( }, }; - if window.size_changed { - window_surfaces.swap_chains.insert( - window.id, - render_device.create_swap_chain(surface, &swap_chain_descriptor), - ); + // Do the initial surface configuration if it hasn't been configured yet + if window_surfaces.configured_windows.insert(window.id) { + render_device.configure_surface(surface, &swap_chain_descriptor); } - let swap_chain = window_surfaces - .swap_chains - .entry(window.id) - .or_insert_with(|| render_device.create_swap_chain(surface, &swap_chain_descriptor)); - - let frame = match swap_chain.get_current_frame() { + let frame = match surface.get_current_texture() { Ok(swap_chain_frame) => swap_chain_frame, - Err(wgpu::SwapChainError::Outdated) => { - let new_swap_chain = - render_device.create_swap_chain(surface, &swap_chain_descriptor); - let frame = new_swap_chain - .get_current_frame() - .expect("Error recreating swap chain"); - window_surfaces - .swap_chains - .insert(window.id, new_swap_chain); - frame + Err(wgpu::SurfaceError::Outdated) => { + render_device.configure_surface(surface, &swap_chain_descriptor); + surface + .get_current_texture() + .expect("Error reconfiguring surface") } err => err.expect("Failed to acquire next swap chain texture!"), }; - window.swap_chain_frame = Some(TextureView::from(frame)); + window.swap_chain_texture = Some(TextureView::from(frame)); } } diff --git a/pipelined/bevy_sprite2/src/render/mod.rs b/pipelined/bevy_sprite2/src/render/mod.rs index 47d8d81492..d572af87b0 100644 --- a/pipelined/bevy_sprite2/src/render/mod.rs +++ b/pipelined/bevy_sprite2/src/render/mod.rs @@ -39,7 +39,7 @@ impl FromWorld for SpriteShaders { let view_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { entries: &[BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::VERTEX | ShaderStage::FRAGMENT, + visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT, ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, @@ -56,7 +56,7 @@ impl FromWorld for SpriteShaders { entries: &[ BindGroupLayoutEntry { binding: 0, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Texture { multisampled: false, sample_type: TextureSampleType::Float { filterable: false }, @@ -66,7 +66,7 @@ impl FromWorld for SpriteShaders { }, BindGroupLayoutEntry { binding: 1, - visibility: ShaderStage::FRAGMENT, + visibility: ShaderStages::FRAGMENT, ty: BindingType::Sampler { comparison: false, filtering: true, @@ -89,7 +89,7 @@ impl FromWorld for SpriteShaders { vertex: VertexState { buffers: &[VertexBufferLayout { array_stride: 20, - step_mode: InputStepMode::Vertex, + step_mode: VertexStepMode::Vertex, attributes: &[ VertexAttribute { format: VertexFormat::Float32x3, @@ -123,7 +123,7 @@ impl FromWorld for SpriteShaders { operation: BlendOperation::Add, }, }), - write_mask: ColorWrite::ALL, + write_mask: ColorWrites::ALL, }], }), layout: Some(&pipeline_layout), @@ -231,8 +231,8 @@ pub struct SpriteMeta { impl Default for SpriteMeta { fn default() -> Self { Self { - vertices: BufferVec::new(BufferUsage::VERTEX), - indices: BufferVec::new(BufferUsage::INDEX), + vertices: BufferVec::new(BufferUsages::VERTEX), + indices: BufferVec::new(BufferUsages::INDEX), view_bind_group: None, quad: Quad { size: Vec2::new(1.0, 1.0), diff --git a/pipelined/bevy_sprite2/src/render/sprite.wgsl b/pipelined/bevy_sprite2/src/render/sprite.wgsl index f3a31f92b3..29362a6fd2 100644 --- a/pipelined/bevy_sprite2/src/render/sprite.wgsl +++ b/pipelined/bevy_sprite2/src/render/sprite.wgsl @@ -4,7 +4,7 @@ struct View { world_position: vec3; }; [[group(0), binding(0)]] -var view: View; +var view: View; struct VertexOutput { [[location(0)]] uv: vec2;