Upgrade to wgpu 28

Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bevyengine/bevy"
 documentation = "https://docs.rs/bevy"
-rust-version = "1.89.0"
+rust-version = "1.92.0"
 
 [workspace]
 resolver = "2"

crates/bevy_anti_alias/Cargo.toml

@@ -34,7 +34,8 @@ bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.18.0-dev" }
 
 # other
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-dlss_wgpu = { version = "2", optional = true }
+# dlss_wgpu = { version = "2", optional = true }
+dlss_wgpu = { git = "https://github.com/ChristopherBiscardi/dlss_wgpu.git", branch = "wgpu-28", optional = true }
 uuid = { version = "1", optional = true }
 
 [lints]

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/node.rs

@@ -108,6 +108,7 @@ impl Node for CasNode {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         };
 
         let mut render_pass = render_context

crates/bevy_anti_alias/src/dlss/node.rs

@@ -77,12 +77,13 @@ impl ViewNode for DlssNode<DlssSuperResolutionFeature> {
         command_encoder.push_debug_group("dlss_super_resolution");
         let time_span = diagnostics.time_span(command_encoder, "dlss_super_resolution");
 
-        dlss_context
+        let dlss_command_buffer = dlss_context
             .render(render_parameters, command_encoder, &adapter)
             .expect("Failed to render DLSS Super Resolution");
 
         time_span.end(command_encoder);
         command_encoder.pop_debug_group();
+        render_context.add_command_buffer(dlss_command_buffer);
 
         Ok(())
     }
@@ -153,13 +154,15 @@ impl ViewNode for DlssNode<DlssRayReconstructionFeature> {
         command_encoder.push_debug_group("dlss_ray_reconstruction");
         let time_span = diagnostics.time_span(command_encoder, "dlss_ray_reconstruction");
 
-        dlss_context
+        let dlss_command_buffer = dlss_context
             .render(render_parameters, command_encoder, &adapter)
             .expect("Failed to render DLSS Ray Reconstruction");
 
         time_span.end(command_encoder);
         command_encoder.pop_debug_group();
 
+        render_context.add_command_buffer(dlss_command_buffer);
+
         Ok(())
     }
 }

crates/bevy_anti_alias/src/fxaa/mod.rs

@@ -147,7 +147,7 @@ pub fn init_fxaa_pipeline(
     );
 
     let sampler = render_device.create_sampler(&SamplerDescriptor {
-        mipmap_filter: FilterMode::Linear,
+        mipmap_filter: MipmapFilterMode::Linear,
         mag_filter: FilterMode::Linear,
         min_filter: FilterMode::Linear,
         ..default()

crates/bevy_anti_alias/src/fxaa/node.rs

@@ -74,6 +74,7 @@ impl ViewNode for FxaaNode {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         };
 
         let mut render_pass = render_context

crates/bevy_anti_alias/src/smaa/mod.rs

@@ -944,6 +944,7 @@ fn perform_edge_detection(
         }),
         timestamp_writes: None,
         occlusion_query_set: None,
+        multiview_mask: None,
     };
 
     // Run the actual render pass.
@@ -1003,6 +1004,7 @@ fn perform_blending_weight_calculation(
         }),
         timestamp_writes: None,
         occlusion_query_set: None,
+        multiview_mask: None,
     };
 
     // Run the actual render pass.
@@ -1056,6 +1058,7 @@ fn perform_neighborhood_blending(
         depth_stencil_attachment: None,
         timestamp_writes: None,
         occlusion_query_set: None,
+        multiview_mask: None,
     };
 
     let mut neighborhood_blending_render_pass = render_context

crates/bevy_anti_alias/src/taa/mod.rs

@@ -216,6 +216,7 @@ impl ViewNode for TemporalAntiAliasNode {
                 depth_stencil_attachment: None,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
             let pass_span = diagnostics.pass_span(&mut taa_pass, "taa");
 

crates/bevy_camera/Cargo.toml

@@ -28,7 +28,7 @@ bevy_color = { path = "../bevy_color", version = "0.18.0-dev", features = [
 bevy_window = { path = "../bevy_window", version = "0.18.0-dev" }
 
 # other
-wgpu-types = { version = "27", default-features = false }
+wgpu-types = { version = "28", default-features = false }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 downcast-rs = { version = "2", default-features = false, features = ["std"] }

crates/bevy_color/Cargo.toml

@@ -20,7 +20,7 @@ serde = { version = "1.0", features = [
 ], default-features = false, optional = true }
 thiserror = { version = "2", default-features = false }
 derive_more = { version = "2", default-features = false, features = ["from"] }
-wgpu-types = { version = "27", default-features = false, optional = true }
+wgpu-types = { version = "28", default-features = false, optional = true }
 encase = { version = "0.12", default-features = false, optional = true }
 
 [features]

crates/bevy_core_pipeline/src/core_2d/main_opaque_pass_2d_node.rs

@@ -70,6 +70,7 @@ impl ViewNode for MainOpaquePass2dNode {
                 depth_stencil_attachment,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
             let mut render_pass = TrackedRenderPass::new(&render_device, render_pass);
             let pass_span = diagnostics.pass_span(&mut render_pass, "main_opaque_pass_2d");

crates/bevy_core_pipeline/src/core_2d/main_transparent_pass_2d_node.rs

@@ -71,6 +71,7 @@ impl ViewNode for MainTransparentPass2dNode {
                     depth_stencil_attachment,
                     timestamp_writes: None,
                     occlusion_query_set: None,
+                    multiview_mask: None,
                 });
                 let mut render_pass = TrackedRenderPass::new(&render_device, render_pass);
 
@@ -107,6 +108,7 @@ impl ViewNode for MainTransparentPass2dNode {
                     depth_stencil_attachment: None,
                     timestamp_writes: None,
                     occlusion_query_set: None,
+                    multiview_mask: None,
                 };
 
                 command_encoder.begin_render_pass(&pass_descriptor);

crates/bevy_core_pipeline/src/core_3d/main_opaque_pass_3d_node.rs

@@ -88,6 +88,7 @@ impl ViewNode for MainOpaquePass3dNode {
                 depth_stencil_attachment,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
             let mut render_pass = TrackedRenderPass::new(&render_device, render_pass);
             let pass_span = diagnostics.pass_span(&mut render_pass, "main_opaque_pass_3d");

crates/bevy_core_pipeline/src/core_3d/main_transmissive_pass_3d_node.rs

@@ -64,6 +64,7 @@ impl ViewNode for MainTransmissivePass3dNode {
             depth_stencil_attachment: Some(depth.get_attachment(StoreOp::Store)),
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         };
 
         // Run the transmissive pass, sorted back-to-front

crates/bevy_core_pipeline/src/core_3d/main_transparent_pass_3d_node.rs

@@ -66,6 +66,7 @@ impl ViewNode for MainTransparentPass3dNode {
                 depth_stencil_attachment: Some(depth.get_attachment(StoreOp::Store)),
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
 
             let pass_span = diagnostics.pass_span(&mut render_pass, "main_transparent_pass_3d");
@@ -95,6 +96,7 @@ impl ViewNode for MainTransparentPass3dNode {
                 depth_stencil_attachment: None,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             };
 
             render_context

crates/bevy_core_pipeline/src/deferred/copy_lighting_id.rs

@@ -99,6 +99,7 @@ impl ViewNode for CopyDeferredLightingIdNode {
             }),
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
 
         let pass_span = diagnostics.pass_span(&mut render_pass, "copy_deferred_lighting_id");

crates/bevy_core_pipeline/src/deferred/node.rs

@@ -223,6 +223,7 @@ fn run_deferred_prepass<'w>(
             depth_stencil_attachment,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
         let mut render_pass = TrackedRenderPass::new(&render_device, render_pass);
         let pass_span = diagnostic.pass_span(&mut render_pass, label);

crates/bevy_core_pipeline/src/fullscreen_material.rs

@@ -318,6 +318,7 @@ impl<T: FullscreenMaterial> ViewNode for FullscreenMaterialNode<T> {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
 
         render_pass.set_render_pipeline(pipeline);

crates/bevy_core_pipeline/src/mip_generation/experimental/depth.rs

@@ -33,8 +33,8 @@ use bevy_render::{
         binding_types::{sampler, texture_2d, texture_2d_multisampled, texture_storage_2d},
         BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries,
         CachedComputePipelineId, ComputePassDescriptor, ComputePipeline, ComputePipelineDescriptor,
-        Extent3d, IntoBinding, PipelineCache, PushConstantRange, Sampler, SamplerBindingType,
-        SamplerDescriptor, ShaderStages, SpecializedComputePipeline, SpecializedComputePipelines,
+        Extent3d, IntoBinding, PipelineCache, Sampler, SamplerBindingType, SamplerDescriptor,
+        ShaderStages, SpecializedComputePipeline, SpecializedComputePipelines,
         StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, TextureFormat,
         TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension,
     },
@@ -428,10 +428,7 @@ impl SpecializedComputePipeline for DownsampleDepthPipeline {
         ComputePipelineDescriptor {
             label: Some(label),
             layout: vec![self.bind_group_layout.clone()],
-            push_constant_ranges: vec![PushConstantRange {
-                stages: ShaderStages::COMPUTE,
-                range: 0..4,
-            }],
+            immediate_size: 4,
             shader: self.shader.clone(),
             shader_defs,
             entry_point: Some(if key.contains(DownsampleDepthPipelineKey::SECOND_PHASE) {
@@ -624,8 +621,8 @@ impl ViewDepthPyramid {
             timestamp_writes: None,
         });
         downsample_pass.set_pipeline(downsample_depth_first_pipeline);
-        // Pass the mip count as a push constant, for simplicity.
-        downsample_pass.set_push_constants(0, &self.mip_count.to_le_bytes());
+        // Pass the mip count as an immediate, for simplicity.
+        downsample_pass.set_immediates(0, &self.mip_count.to_le_bytes());
         downsample_pass.set_bind_group(0, downsample_depth_bind_group, &[]);
         downsample_pass.dispatch_workgroups(view_size.x.div_ceil(64), view_size.y.div_ceil(64), 1);
 

crates/bevy_core_pipeline/src/mip_generation/experimental/downsample_depth.wgsl

@@ -25,7 +25,7 @@
 @group(0) @binding(12) var mip_12: texture_storage_2d<r32float, write>;
 @group(0) @binding(13) var samplr: sampler;
 struct Constants { max_mip_level: u32 }
-var<push_constant> constants: Constants;
+var<immediate> constants: Constants;
 
 /// Generates a hierarchical depth buffer.
 /// Based on FidelityFX SPD v2.1 https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK/blob/d7531ae47d8b36a5d4025663e731a47a38be882f/sdk/include/FidelityFX/gpu/spd/ffx_spd.h#L528

crates/bevy_core_pipeline/src/mip_generation/mod.rs

@@ -36,8 +36,8 @@ use bevy_render::{
     diagnostic::RecordDiagnostics as _,
     render_asset::RenderAssets,
     render_resource::{
-        binding_types::uniform_buffer, BindGroupLayoutDescriptor, FilterMode, ShaderType,
-        TextureFormatFeatureFlags, UniformBuffer,
+        binding_types::uniform_buffer, BindGroupLayoutDescriptor, FilterMode, MipmapFilterMode,
+        ShaderType, TextureFormatFeatureFlags, UniformBuffer,
     },
     renderer::{RenderAdapter, RenderQueue},
     settings::WgpuFeatures,
@@ -372,7 +372,7 @@ impl FromWorld for MipGenerationResources {
                 label: Some("mip generation sampler"),
                 mag_filter: FilterMode::Linear,
                 min_filter: FilterMode::Linear,
-                mipmap_filter: FilterMode::Nearest,
+                mipmap_filter: MipmapFilterMode::Nearest,
                 ..default()
             }),
         }
@@ -865,7 +865,7 @@ fn create_downsampling_pipelines(
         pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
             label: Some(format!("mip generation pipeline, pass 1 ({:?})", texture_format).into()),
             layout: vec![downsampling_bind_group_layout_pass_1.clone()],
-            push_constant_ranges: vec![],
+            immediate_size: 0,
             shader: downsample_shader.clone(),
             shader_defs: downsampling_first_shader_defs,
             entry_point: Some("downsample_first".into()),
@@ -878,7 +878,7 @@ fn create_downsampling_pipelines(
         pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
             label: Some(format!("mip generation pipeline, pass 2 ({:?})", texture_format).into()),
             layout: vec![downsampling_bind_group_layout_pass_2.clone()],
-            push_constant_ranges: vec![],
+            immediate_size: 0,
             shader: downsample_shader.clone(),
             shader_defs: downsampling_second_shader_defs,
             entry_point: Some("downsample_second".into()),

crates/bevy_core_pipeline/src/oit/resolve/node.rs

@@ -66,6 +66,7 @@ impl ViewNode for OitResolveNode {
                 depth_stencil_attachment: None,
                 timestamp_writes: None,
                 occlusion_query_set: None,
+                multiview_mask: None,
             });
             let pass_span = diagnostics.pass_span(&mut render_pass, "oit_resolve");
 

crates/bevy_core_pipeline/src/prepass/node.rs

@@ -182,6 +182,7 @@ fn run_prepass<'w>(
             depth_stencil_attachment,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
 
         let mut render_pass = TrackedRenderPass::new(&render_device, render_pass);

crates/bevy_core_pipeline/src/tonemapping/node.rs

@@ -130,6 +130,7 @@ impl ViewNode for TonemappingNode {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         };
 
         let mut render_pass = render_context

crates/bevy_core_pipeline/src/upscaling/node.rs

@@ -81,6 +81,7 @@ impl ViewNode for UpscalingNode {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         };
 
         let mut render_pass = render_context

crates/bevy_image/Cargo.toml

@@ -70,7 +70,7 @@ image = { version = "0.25.2", default-features = false }
 # misc
 bitflags = { version = "2.3", features = ["serde"] }
 bytemuck = { version = "1.5" }
-wgpu-types = { version = "27", default-features = false }
+wgpu-types = { version = "28", default-features = false }
 serde = { version = "1", features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 futures-lite = "2.0.1"

crates/bevy_image/src/image.rs

@@ -20,9 +20,9 @@ use core::hash::Hash;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use wgpu_types::{
-    AddressMode, CompareFunction, Extent3d, Features, FilterMode, SamplerBorderColor,
-    SamplerDescriptor, TextureDataOrder, TextureDescriptor, TextureDimension, TextureFormat,
-    TextureUsages, TextureViewDescriptor,
+    AddressMode, CompareFunction, Extent3d, Features, FilterMode, MipmapFilterMode,
+    SamplerBorderColor, SamplerDescriptor, TextureDataOrder, TextureDescriptor, TextureDimension,
+    TextureFormat, TextureUsages, TextureViewDescriptor,
 };
 
 /// Trait used to provide default values for Bevy-external types that
@@ -891,6 +891,15 @@ impl From<ImageFilterMode> for FilterMode {
     }
 }
 
+impl From<ImageFilterMode> for MipmapFilterMode {
+    fn from(value: ImageFilterMode) -> Self {
+        match value {
+            ImageFilterMode::Nearest => MipmapFilterMode::Nearest,
+            ImageFilterMode::Linear => MipmapFilterMode::Linear,
+        }
+    }
+}
+
 impl From<ImageCompareFunction> for CompareFunction {
     fn from(value: ImageCompareFunction) -> Self {
         match value {
@@ -928,6 +937,15 @@ impl From<AddressMode> for ImageAddressMode {
     }
 }
 
+impl From<MipmapFilterMode> for ImageFilterMode {
+    fn from(value: MipmapFilterMode) -> Self {
+        match value {
+            MipmapFilterMode::Nearest => ImageFilterMode::Nearest,
+            MipmapFilterMode::Linear => ImageFilterMode::Linear,
+        }
+    }
+}
+
 impl From<FilterMode> for ImageFilterMode {
     fn from(value: FilterMode) -> Self {
         match value {

crates/bevy_mesh/Cargo.toml

@@ -27,7 +27,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 # other
 bitflags = { version = "2.3", features = ["serde"] }
 bytemuck = { version = "1.5" }
-wgpu-types = { version = "27", default-features = false }
+wgpu-types = { version = "28", default-features = false }
 serde = { version = "1", default-features = false, features = [
   "derive",
 ], optional = true }

crates/bevy_pbr/src/atmosphere/node.rs

@@ -212,6 +212,7 @@ impl ViewNode for RenderSkyNode {
             depth_stencil_attachment: None,
             timestamp_writes: None,
             occlusion_query_set: None,
+            multiview_mask: None,
         });
         let pass_span = diagnostics.pass_span(&mut render_sky_pass, "render_sky");
 

crates/bevy_pbr/src/atmosphere/resources.rs

@@ -238,7 +238,7 @@ impl FromWorld for AtmosphereSampler {
         let sampler = render_device.create_sampler(&SamplerDescriptor {
             mag_filter: FilterMode::Linear,
             min_filter: FilterMode::Linear,
-            mipmap_filter: FilterMode::Nearest,
+            mipmap_filter: MipmapFilterMode::Nearest,
             ..Default::default()
         });