Examples fixes

Author: Zeophlite

examples/3d/manual_material.rs

@@ -21,7 +21,7 @@ use bevy::{
         render_phase::DrawFunctions,
         render_resource::{
             binding_types::{sampler, texture_2d},
-            AsBindGroup, BindGroupLayout, BindGroupLayoutEntries, BindingResources,
+            AsBindGroup, BindGroupLayoutDescriptor, BindGroupLayoutEntries, BindingResources,
             OwnedBindingResource, Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages,
             TextureSampleType, TextureViewDimension, UnpreparedBindGroup,
         },
@@ -77,7 +77,7 @@ fn init_image_material_resources(
     render_device: Res<RenderDevice>,
     mut bind_group_allocators: ResMut<MaterialBindGroupAllocators>,
 ) {
-    let bind_group_layout = render_device.create_bind_group_layout(
+    let bind_group_layout = BindGroupLayoutDescriptor::new(
         "image_material_layout",
         &BindGroupLayoutEntries::sequential(
             ShaderStages::FRAGMENT,
@@ -98,7 +98,7 @@ fn init_image_material_resources(
 }
 
 #[derive(Resource)]
-struct ImageMaterialBindGroupLayout(BindGroupLayout);
+struct ImageMaterialBindGroupLayout(BindGroupLayoutDescriptor);
 
 #[derive(Resource)]
 struct ImageMaterialBindGroupSampler(Sampler);

examples/shader/compute_shader_game_of_life.rs

@@ -136,6 +136,7 @@ fn prepare_bind_group(
     game_of_life_images: Res<GameOfLifeImages>,
     game_of_life_uniforms: Res<GameOfLifeUniforms>,
     render_device: Res<RenderDevice>,
+    pipeline_cache: Res<PipelineCache>,
     queue: Res<RenderQueue>,
 ) {
     let view_a = gpu_images.get(&game_of_life_images.texture_a).unwrap();
@@ -148,7 +149,7 @@ fn prepare_bind_group(
 
     let bind_group_0 = render_device.create_bind_group(
         None,
-        &pipeline.texture_bind_group_layout,
+        &pipeline_cache.get_bind_group_layout(&pipeline.texture_bind_group_layout),
         &BindGroupEntries::sequential((
             &view_a.texture_view,
             &view_b.texture_view,
@@ -157,7 +158,7 @@ fn prepare_bind_group(
     );
     let bind_group_1 = render_device.create_bind_group(
         None,
-        &pipeline.texture_bind_group_layout,
+        &pipeline_cache.get_bind_group_layout(&pipeline.texture_bind_group_layout),
         &BindGroupEntries::sequential((
             &view_b.texture_view,
             &view_a.texture_view,
@@ -169,18 +170,17 @@ fn prepare_bind_group(
 
 #[derive(Resource)]
 struct GameOfLifePipeline {
-    texture_bind_group_layout: BindGroupLayout,
+    texture_bind_group_layout: BindGroupLayoutDescriptor,
     init_pipeline: CachedComputePipelineId,
     update_pipeline: CachedComputePipelineId,
 }
 
 fn init_game_of_life_pipeline(
     mut commands: Commands,
-    render_device: Res<RenderDevice>,
     asset_server: Res<AssetServer>,
     pipeline_cache: Res<PipelineCache>,
 ) {
-    let texture_bind_group_layout = render_device.create_bind_group_layout(
+    let texture_bind_group_layout = BindGroupLayoutDescriptor::new(
         "GameOfLifeImages",
         &BindGroupLayoutEntries::sequential(
             ShaderStages::COMPUTE,

examples/shader/gpu_readback.rs

@@ -153,6 +153,7 @@ fn prepare_bind_group(
     mut commands: Commands,
     pipeline: Res<ComputePipeline>,
     render_device: Res<RenderDevice>,
+    pipeline_cache: Res<PipelineCache>,
     buffer: Res<ReadbackBuffer>,
     image: Res<ReadbackImage>,
     buffers: Res<RenderAssets<GpuShaderStorageBuffer>>,
@@ -162,7 +163,7 @@ fn prepare_bind_group(
     let image = images.get(&image.0).unwrap();
     let bind_group = render_device.create_bind_group(
         None,
-        &pipeline.layout,
+        &pipeline_cache.get_bind_group_layout(pipeline.layout),
         &BindGroupEntries::sequential((
             buffer.buffer.as_entire_buffer_binding(),
             image.texture_view.into_binding(),
@@ -173,7 +174,7 @@ fn prepare_bind_group(
 
 #[derive(Resource)]
 struct ComputePipeline {
-    layout: BindGroupLayout,
+    layout: BindGroupLayoutDescriptor,
     pipeline: CachedComputePipelineId,
 }
 
@@ -183,8 +184,8 @@ fn init_compute_pipeline(
     asset_server: Res<AssetServer>,
     pipeline_cache: Res<PipelineCache>,
 ) {
-    let layout = render_device.create_bind_group_layout(
-        None,
+    let layout = BindGroupLayoutDescriptor::new(
+        "",
         &BindGroupLayoutEntries::sequential(
             ShaderStages::COMPUTE,
             (

examples/shader_advanced/custom_post_processing.rs

@@ -178,7 +178,7 @@ impl ViewNode for PostProcessNode {
         // is to make sure you get it during the node execution.
         let bind_group = render_context.render_device().create_bind_group(
             "post_process_bind_group",
-            &post_process_pipeline.layout,
+            &pipeline_cache.get_bind_group_layout(&post_process_pipeline.layout),
             // It's important for this to match the BindGroupLayout defined in the PostProcessPipeline
             &BindGroupEntries::sequential((
                 // Make sure to use the source view
@@ -222,7 +222,7 @@ impl ViewNode for PostProcessNode {
 // This contains global data used by the render pipeline. This will be created once on startup.
 #[derive(Resource)]
 struct PostProcessPipeline {
-    layout: BindGroupLayout,
+    layout: BindGroupLayoutDescriptor,
     sampler: Sampler,
     pipeline_id: CachedRenderPipelineId,
 }
@@ -235,7 +235,7 @@ fn init_post_process_pipeline(
     pipeline_cache: Res<PipelineCache>,
 ) {
     // We need to define the bind group layout used for our pipeline
-    let layout = render_device.create_bind_group_layout(
+    let layout = BindGroupLayoutDescriptor::new(
         "post_process_bind_group_layout",
         &BindGroupLayoutEntries::sequential(
             // The layout entries will only be visible in the fragment stage

examples/shader_advanced/texture_binding_array.rs

@@ -102,8 +102,9 @@ impl AsBindGroup for BindlessMaterial {
 
     fn as_bind_group(
         &self,
-        layout: &BindGroupLayout,
+        layout: &BindGroupLayoutDescriptor,
         render_device: &RenderDevice,
+        pipeline_cache: &PipelineCache,
         (image_assets, fallback_image): &mut SystemParamItem<'_, '_, Self::Param>,
     ) -> Result<PreparedBindGroup, AsBindGroupError> {
         // retrieve the render resources from handles
@@ -129,7 +130,7 @@ impl AsBindGroup for BindlessMaterial {
 
         let bind_group = render_device.create_bind_group(
             "bindless_material_bind_group",
-            layout,
+            &pipeline_cache.get_bind_group_layout(layout),
             &BindGroupEntries::sequential((&textures[..], &fallback_image.sampler)),
         );