Ugrade to wgpu version 25.0

assets/shaders/array_texture.wgsl

@@ -7,8 +7,8 @@
 }
 #import bevy_core_pipeline::tonemapping::tone_mapping
 
-@group(2) @binding(0) var my_array_texture: texture_2d_array<f32>;
-@group(2) @binding(1) var my_array_texture_sampler: sampler;
+@group(3) @binding(0) var my_array_texture: texture_2d_array<f32>;
+@group(3) @binding(1) var my_array_texture_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/automatic_instancing.wgsl

@@ -3,8 +3,8 @@
     view_transformations::position_world_to_clip
 }
 
-@group(2) @binding(0) var texture: texture_2d<f32>;
-@group(2) @binding(1) var texture_sampler: sampler;
+@group(3) @binding(0) var texture: texture_2d<f32>;
+@group(3) @binding(1) var texture_sampler: sampler;
 
 struct Vertex {
     @builtin(instance_index) instance_index: u32,

assets/shaders/bindless_material.wgsl

@@ -15,12 +15,12 @@ struct MaterialBindings {
 }
 
 #ifdef BINDLESS
-@group(2) @binding(0) var<storage> materials: array<MaterialBindings>;
-@group(2) @binding(10) var<storage> material_color: binding_array<Color>;
+@group(3) @binding(0) var<storage> materials: array<MaterialBindings>;
+@group(3) @binding(10) var<storage> material_color: binding_array<Color>;
 #else   // BINDLESS
-@group(2) @binding(0) var<uniform> material_color: Color;
-@group(2) @binding(1) var material_color_texture: texture_2d<f32>;
-@group(2) @binding(2) var material_color_sampler: sampler;
+@group(3) @binding(0) var<uniform> material_color: Color;
+@group(3) @binding(1) var material_color_texture: texture_2d<f32>;
+@group(3) @binding(2) var material_color_sampler: sampler;
 #endif  // BINDLESS
 
 @fragment

assets/shaders/cubemap_unlit.wgsl

@@ -1,12 +1,12 @@
 #import bevy_pbr::forward_io::VertexOutput
 
 #ifdef CUBEMAP_ARRAY
-@group(2) @binding(0) var base_color_texture: texture_cube_array<f32>;
+@group(3) @binding(0) var base_color_texture: texture_cube_array<f32>;
 #else
-@group(2) @binding(0) var base_color_texture: texture_cube<f32>;
+@group(3) @binding(0) var base_color_texture: texture_cube<f32>;
 #endif
 
-@group(2) @binding(1) var base_color_sampler: sampler;
+@group(3) @binding(1) var base_color_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/custom_material.frag

@@ -3,10 +3,10 @@ layout(location = 0) in vec2 v_Uv;
 
 layout(location = 0) out vec4 o_Target;
 
-layout(set = 2, binding = 0) uniform vec4 CustomMaterial_color;
+layout(set = 3, binding = 0) uniform vec4 CustomMaterial_color;
 
-layout(set = 2, binding = 1) uniform texture2D CustomMaterial_texture;
-layout(set = 2, binding = 2) uniform sampler CustomMaterial_sampler;
+layout(set = 3, binding = 1) uniform texture2D CustomMaterial_texture;
+layout(set = 3, binding = 2) uniform sampler CustomMaterial_sampler;
 
 // wgsl modules can be imported and used in glsl
 // FIXME - this doesn't work any more ...

assets/shaders/custom_material.vert

@@ -25,9 +25,9 @@ struct Mesh {
 };
 
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-layout(set = 1, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
+layout(set = 2, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
 #else
-layout(set = 1, binding = 0) readonly buffer _Meshes {
+layout(set = 2, binding = 0) readonly buffer _Meshes {
     Mesh Meshes[];
 };
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE

assets/shaders/custom_material.wesl

@@ -10,7 +10,7 @@ struct CustomMaterial {
     time: vec4<f32>,
 }
 
-@group(2) @binding(0) var<uniform> material: CustomMaterial;
+@group(3) @binding(0) var<uniform> material: CustomMaterial;
 
 @fragment
 fn fragment(

assets/shaders/custom_material.wgsl

@@ -2,9 +2,9 @@
 // we can import items from shader modules in the assets folder with a quoted path
 #import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER
 
-@group(2) @binding(0) var<uniform> material_color: vec4<f32>;
-@group(2) @binding(1) var material_color_texture: texture_2d<f32>;
-@group(2) @binding(2) var material_color_sampler: sampler;
+@group(3) @binding(0) var<uniform> material_color: vec4<f32>;
+@group(3) @binding(1) var material_color_texture: texture_2d<f32>;
+@group(3) @binding(2) var material_color_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/custom_material_screenspace_texture.wgsl

@@ -4,8 +4,8 @@
     utils::coords_to_viewport_uv,
 }
 
-@group(2) @binding(0) var texture: texture_2d<f32>;
-@group(2) @binding(1) var texture_sampler: sampler;
+@group(3) @binding(0) var texture: texture_2d<f32>;
+@group(3) @binding(1) var texture_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/custom_vertex_attribute.wgsl

@@ -3,7 +3,7 @@
 struct CustomMaterial {
     color: vec4<f32>,
 };
-@group(2) @binding(0) var<uniform> material: CustomMaterial;
+@group(3) @binding(0) var<uniform> material: CustomMaterial;
 
 struct Vertex {
     @builtin(instance_index) instance_index: u32,

assets/shaders/extended_material.wgsl

@@ -19,7 +19,7 @@ struct MyExtendedMaterial {
     quantize_steps: u32,
 }
 
-@group(2) @binding(100)
+@group(3) @binding(100)
 var<uniform> my_extended_material: MyExtendedMaterial;
 
 @fragment

assets/shaders/extended_material_bindless.wgsl

@@ -42,19 +42,19 @@ struct ExampleBindlessExtendedMaterial {
 
 // The indices of the bindless resources in the bindless resource arrays, for
 // the `ExampleBindlessExtension` fields.
-@group(2) @binding(100) var<storage> example_extended_material_indices:
+@group(3) @binding(100) var<storage> example_extended_material_indices:
     array<ExampleBindlessExtendedMaterialIndices>;
 // An array that holds the `ExampleBindlessExtendedMaterial` plain old data,
 // indexed by `ExampleBindlessExtendedMaterialIndices.material`.
-@group(2) @binding(101) var<storage> example_extended_material:
+@group(3) @binding(101) var<storage> example_extended_material:
     array<ExampleBindlessExtendedMaterial>;
 
 #else   // BINDLESS
 
 // In non-bindless mode, we simply use a uniform for the plain old data.
-@group(2) @binding(50) var<uniform> example_extended_material: ExampleBindlessExtendedMaterial;
-@group(2) @binding(51) var modulate_texture: texture_2d<f32>;
-@group(2) @binding(52) var modulate_sampler: sampler;
+@group(3) @binding(50) var<uniform> example_extended_material: ExampleBindlessExtendedMaterial;
+@group(3) @binding(51) var modulate_texture: texture_2d<f32>;
+@group(3) @binding(52) var modulate_sampler: sampler;
 
 #endif  // BINDLESS
 

assets/shaders/fallback_image_test.wgsl

@@ -1,22 +1,22 @@
 #import bevy_pbr::forward_io::VertexOutput
 
-@group(2) @binding(0) var test_texture_1d: texture_1d<f32>;
-@group(2) @binding(1) var test_texture_1d_sampler: sampler;
+@group(3) @binding(0) var test_texture_1d: texture_1d<f32>;
+@group(3) @binding(1) var test_texture_1d_sampler: sampler;
 
-@group(2) @binding(2) var test_texture_2d: texture_2d<f32>;
-@group(2) @binding(3) var test_texture_2d_sampler: sampler;
+@group(3) @binding(2) var test_texture_2d: texture_2d<f32>;
+@group(3) @binding(3) var test_texture_2d_sampler: sampler;
 
-@group(2) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
-@group(2) @binding(5) var test_texture_2d_array_sampler: sampler;
+@group(3) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
+@group(3) @binding(5) var test_texture_2d_array_sampler: sampler;
 
-@group(2) @binding(6) var test_texture_cube: texture_cube<f32>;
-@group(2) @binding(7) var test_texture_cube_sampler: sampler;
+@group(3) @binding(6) var test_texture_cube: texture_cube<f32>;
+@group(3) @binding(7) var test_texture_cube_sampler: sampler;
 
-@group(2) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
-@group(2) @binding(9) var test_texture_cube_array_sampler: sampler;
+@group(3) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
+@group(3) @binding(9) var test_texture_cube_array_sampler: sampler;
 
-@group(2) @binding(10) var test_texture_3d: texture_3d<f32>;
-@group(2) @binding(11) var test_texture_3d_sampler: sampler;
+@group(3) @binding(10) var test_texture_3d: texture_3d<f32>;
+@group(3) @binding(11) var test_texture_3d_sampler: sampler;
 
 @fragment
 fn fragment(in: VertexOutput) {}

assets/shaders/irradiance_volume_voxel_visualization.wgsl

@@ -12,7 +12,7 @@ struct VoxelVisualizationIrradianceVolumeInfo {
     intensity: f32,
 }
 
-@group(2) @binding(100)
+@group(3) @binding(100)
 var<uniform> irradiance_volume_info: VoxelVisualizationIrradianceVolumeInfo;
 
 @fragment

assets/shaders/line_material.wgsl

@@ -4,7 +4,7 @@ struct LineMaterial {
     color: vec4<f32>,
 };
 
-@group(2) @binding(0) var<uniform> material: LineMaterial;
+@group(3) @binding(0) var<uniform> material: LineMaterial;
 
 @fragment
 fn fragment(

assets/shaders/shader_defs.wgsl

@@ -4,7 +4,7 @@ struct CustomMaterial {
     color: vec4<f32>,
 };
 
-@group(2) @binding(0) var<uniform> material: CustomMaterial;
+@group(3) @binding(0) var<uniform> material: CustomMaterial;
 
 @fragment
 fn fragment(

assets/shaders/show_prepass.wgsl

@@ -11,7 +11,7 @@ struct ShowPrepassSettings {
     padding_1: u32,
     padding_2: u32,
 }
-@group(2) @binding(0) var<uniform> settings: ShowPrepassSettings;
+@group(3) @binding(0) var<uniform> settings: ShowPrepassSettings;
 
 @fragment
 fn fragment(

assets/shaders/storage_buffer.wgsl

@@ -3,7 +3,7 @@
     view_transformations::position_world_to_clip
 }
 
-@group(2) @binding(0) var<storage, read> colors: array<vec4<f32>, 5>;
+@group(3) @binding(0) var<storage, read> colors: array<vec4<f32>, 5>;
 
 struct Vertex {
     @builtin(instance_index) instance_index: u32,

assets/shaders/texture_binding_array.wgsl

@@ -1,7 +1,7 @@
 #import bevy_pbr::forward_io::VertexOutput
 
-@group(2) @binding(0) var textures: binding_array<texture_2d<f32>>;
-@group(2) @binding(1) var nearest_sampler: sampler;
+@group(3) @binding(0) var textures: binding_array<texture_2d<f32>>;
+@group(3) @binding(1) var nearest_sampler: sampler;
 // We can also have array of samplers
 // var samplers: binding_array<sampler>;
 

assets/shaders/water_material.wgsl

@@ -23,9 +23,9 @@ struct WaterSettings {
 
 @group(0) @binding(1) var<uniform> globals: Globals;
 
-@group(2) @binding(100) var water_normals_texture: texture_2d<f32>;
-@group(2) @binding(101) var water_normals_sampler: sampler;
-@group(2) @binding(102) var<uniform> water_settings: WaterSettings;
+@group(3) @binding(100) var water_normals_texture: texture_2d<f32>;
+@group(3) @binding(101) var water_normals_sampler: sampler;
+@group(3) @binding(102) var<uniform> water_settings: WaterSettings;
 
 // Samples a single octave of noise and returns the resulting normal.
 fn sample_noise_octave(uv: vec2<f32>, strength: f32) -> vec3<f32> {

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 = "24", default-features = false, optional = true }
+wgpu-types = { version = "25", default-features = false, optional = true }
 encase = { version = "0.10", default-features = false, optional = true }
 
 [features]

crates/bevy_gizmos/src/pipeline_3d.rs

@@ -123,8 +123,7 @@ impl SpecializedRenderPipeline for LineGizmoPipeline {
             .mesh_pipeline
             .get_view_layout(key.view_key.into())
             .clone();
-
-        let layout = vec![view_layout, self.uniform_layout.clone()];
+        let layout = vec![view_layout.main_layout.clone(), self.uniform_layout.clone()];
 
         let fragment_entry_point = match key.line_style {
             GizmoLineStyle::Solid => "fragment_solid",
@@ -220,8 +219,7 @@ impl SpecializedRenderPipeline for LineJointGizmoPipeline {
             .mesh_pipeline
             .get_view_layout(key.view_key.into())
             .clone();
-
-        let layout = vec![view_layout, self.uniform_layout.clone()];
+        let layout = vec![view_layout.main_layout.clone(), self.uniform_layout.clone()];
 
         if key.joints == GizmoLineJoint::None {
             error!("There is no entry point for line joints with GizmoLineJoints::None. Please consider aborting the drawing process before reaching this stage.");

crates/bevy_image/Cargo.toml

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

crates/bevy_mesh/Cargo.toml

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

crates/bevy_pbr/src/atmosphere/render_sky.wgsl

@@ -1,3 +1,5 @@
+enable dual_source_blending;
+
 #import bevy_pbr::atmosphere::{
     types::{Atmosphere, AtmosphereSettings},
     bindings::{atmosphere, view, atmosphere_transforms},
@@ -19,9 +21,11 @@
 #endif
 
 struct RenderSkyOutput {
-    @location(0) inscattering: vec4<f32>,
 #ifdef DUAL_SOURCE_BLENDING
-    @location(0) @second_blend_source transmittance: vec4<f32>,
+    @location(0) @blend_src(0) inscattering: vec4<f32>,
+    @location(0) @blend_src(1) transmittance: vec4<f32>,
+#else
+    @location(0) inscattering: vec4<f32>,
 #endif
 }
 

crates/bevy_pbr/src/decal/forward_decal.wgsl

@@ -10,7 +10,7 @@
 }
 #import bevy_render::maths::project_onto
 
-@group(2) @binding(200)
+@group(3) @binding(200)
 var<uniform> inv_depth_fade_factor: f32;
 
 struct ForwardDecalInformation {

crates/bevy_pbr/src/deferred/deferred_lighting.wgsl

@@ -29,7 +29,7 @@ struct PbrDeferredLightingDepthId {
     _webgl2_padding_2: f32,
 #endif
 }
-@group(1) @binding(0)
+@group(2) @binding(0)
 var<uniform> depth_id: PbrDeferredLightingDepthId;
 
 @vertex