Remove bufferslice lifetime

examples/features/src/bunnymark/mod.rs

@@ -331,7 +331,7 @@ impl crate::framework::Example for Example {
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &local_buffer,
+                    buffer: local_buffer.clone(),
                     offset: 0,
                     size: wgpu::BufferSize::new(size_of::<Bunny>() as _),
                 }),

examples/features/src/shadow/mod.rs

@@ -350,7 +350,7 @@ impl crate::framework::Example for Example {
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &entity_uniform_buf,
+                    buffer: entity_uniform_buf.clone(),
                     offset: 0,
                     size: wgpu::BufferSize::new(entity_uniform_size),
                 }),

examples/features/src/texture_arrays/mod.rs

@@ -316,7 +316,7 @@ impl crate::framework::Example for Example {
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &texture_index_buffer,
+                    buffer: texture_index_buffer.clone(),
                     offset: 0,
                     size: Some(NonZeroU64::new(4).unwrap()),
                 }),

examples/features/src/uniform_values/mod.rs

@@ -150,7 +150,7 @@ impl WgpuContext {
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &uniform_buffer,
+                    buffer: uniform_buffer.clone(),
                     offset: 0,
                     size: None,
                 }),

tests/src/image.rs

@@ -333,7 +333,7 @@ fn copy_via_compute(
             BindGroupEntry {
                 binding: 1,
                 resource: BindingResource::Buffer(BufferBinding {
-                    buffer: &output_buffer,
+                    buffer: output_buffer.clone(),
                     offset: 0,
                     size: None,
                 }),

tests/tests/wgpu-gpu/bind_group_layout_dedup.rs

@@ -448,7 +448,7 @@ fn bgl_dedupe_derived(ctx: TestingContext) {
         entries: &[wgpu::BindGroupEntry {
             binding: 0,
             resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                buffer: &buffer,
+                buffer: buffer.clone(),
                 offset: 0,
                 size: None,
             }),
@@ -460,7 +460,7 @@ fn bgl_dedupe_derived(ctx: TestingContext) {
         entries: &[wgpu::BindGroupEntry {
             binding: 0,
             resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                buffer: &buffer,
+                buffer: buffer.clone(),
                 offset: 0,
                 size: None,
             }),

tests/tests/wgpu-gpu/bind_groups.rs

@@ -96,7 +96,7 @@ fn multiple_bindings_with_differing_sizes(ctx: TestingContext) {
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &buffer,
+                    buffer: buffer.clone(),
                     offset: 0,
                     size: Some(NonZeroU64::new(u64::try_from(8 - 4 * i).unwrap()).unwrap()),
                 }),

tests/tests/wgpu-gpu/oob_indexing.rs

@@ -396,15 +396,15 @@ async fn d3d12_restrict_dynamic_buffers(ctx: TestingContext) {
             wgpu::BindGroupEntry {
                 binding: 2,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &in_data_uniform_buffer,
+                    buffer: in_data_uniform_buffer.clone(),
                     offset: 0,
                     size: Some(std::num::NonZeroU64::new(4 * 4).unwrap()),
                 }),
             },
             wgpu::BindGroupEntry {
                 binding: 3,
                 resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                    buffer: &in_data_storage_buffer,
+                    buffer: in_data_storage_buffer.clone(),
                     offset: 0,
                     size: Some(std::num::NonZeroU64::new(4 * 4).unwrap()),
                 }),

tests/tests/wgpu-gpu/samplers.rs

@@ -479,7 +479,7 @@ fn sampler_bind_group(ctx: TestingContext, group_type: GroupType) {
         entries: &[wgpu::BindGroupEntry {
             binding: 0,
             resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
-                buffer: &output_buffer,
+                buffer: output_buffer.clone(),
                 offset: 0,
                 size: None,
             }),

tests/tests/wgpu-gpu/shader/zero_init_workgroup_mem.rs

@@ -54,7 +54,7 @@ static ZERO_INIT_WORKGROUP_MEMORY: GpuTestConfiguration = GpuTestConfiguration::
             entries: &[BindGroupEntry {
                 binding: 0,
                 resource: BindingResource::Buffer(BufferBinding {
-                    buffer: &output_buffer,
+                    buffer: output_buffer.clone(),
                     offset: 0,
                     size: Some(NonZeroU64::new(BUFFER_BINDING_SIZE as u64).unwrap()),
                 }),

tests/tests/wgpu-gpu/timestamp_normalization/utils.rs

@@ -279,7 +279,5 @@ fn process_shader(ctx: TestingContext, inputs: &[u8], entry_point_src: &str) ->
 
     ctx.device.poll(wgpu::PollType::Wait).unwrap();
 
-    let value = pulldown_buffer.get_mapped_range(..).to_vec();
-
-    value
+    pulldown_buffer.get_mapped_range(..).to_vec()
 }

tests/tests/wgpu-validation/api/buffer_slice.rs

@@ -36,7 +36,7 @@ fn getters() {
             slice_with_size.offset(),
             slice_with_size.size()
         ),
-        (&buffer, 10, NonZero::new(80).unwrap())
+        (buffer.clone(), 10, NonZero::new(80).unwrap())
     );
 
     let slice_without_size = buffer.slice(10..);
@@ -46,7 +46,7 @@ fn getters() {
             slice_without_size.offset(),
             slice_without_size.size()
         ),
-        (&buffer, 10, NonZero::new(90).unwrap())
+        (buffer.clone(), 10, NonZero::new(90).unwrap())
     );
 }
 
@@ -64,6 +64,6 @@ fn into_buffer_binding() {
     else {
         panic!("didn't match")
     };
-    assert_eq!(b, &buffer);
+    assert_eq!(b, buffer.clone());
     assert_eq!(size, NonZero::new(30).unwrap());
 }

wgpu/src/api/bind_group.rs

@@ -38,14 +38,14 @@ pub enum BindingResource<'a> {
     ///
     /// Corresponds to [`wgt::BufferBindingType::Uniform`] and [`wgt::BufferBindingType::Storage`]
     /// with [`BindGroupLayoutEntry::count`] set to None.
-    Buffer(BufferBinding<'a>),
+    Buffer(BufferBinding),
     /// Binding is backed by an array of buffers.
     ///
     /// [`Features::BUFFER_BINDING_ARRAY`] must be supported to use this feature.
     ///
     /// Corresponds to [`wgt::BufferBindingType::Uniform`] and [`wgt::BufferBindingType::Storage`]
     /// with [`BindGroupLayoutEntry::count`] set to Some.
-    BufferArray(&'a [BufferBinding<'a>]),
+    BufferArray(&'a [BufferBinding]),
     /// Binding is a sampler.
     ///
     /// Corresponds to [`wgt::BindingType::Sampler`] with [`BindGroupLayoutEntry::count`] set to None.
@@ -90,9 +90,9 @@ static_assertions::assert_impl_all!(BindingResource<'_>: Send, Sync);
 /// Corresponds to [WebGPU `GPUBufferBinding`](
 /// https://gpuweb.github.io/gpuweb/#dictdef-gpubufferbinding).
 #[derive(Clone, Debug)]
-pub struct BufferBinding<'a> {
+pub struct BufferBinding {
     /// The buffer to bind.
-    pub buffer: &'a Buffer,
+    pub buffer: Buffer,
 
     /// Base offset of the buffer, in bytes.
     ///
@@ -115,7 +115,7 @@ pub struct BufferBinding<'a> {
     pub size: Option<BufferSize>,
 }
 #[cfg(send_sync)]
-static_assertions::assert_impl_all!(BufferBinding<'_>: Send, Sync);
+static_assertions::assert_impl_all!(BufferBinding: Send, Sync);
 
 /// An element of a [`BindGroupDescriptor`], consisting of a bindable resource
 /// and the slot to bind it to.