[Merged by Bors] - removed unused RenderResourceId and SwapChainFrame

pipelined/bevy_render2/src/render_phase/draw_state.rs

@@ -127,7 +127,7 @@ impl<'a> TrackedRenderPass<'a> {
             );
         }
         self.pass
-            .set_bind_group(index as u32, bind_group.value(), dynamic_uniform_indices);
+            .set_bind_group(index as u32, bind_group, dynamic_uniform_indices);
         self.state
             .set_bind_group(index as usize, bind_group.id(), dynamic_uniform_indices);
     }

pipelined/bevy_render2/src/render_resource/bind_group.rs

@@ -1,5 +1,5 @@
 use bevy_reflect::Uuid;
-use std::sync::Arc;
+use std::{ops::Deref, sync::Arc};
 
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 pub struct BindGroupId(Uuid);
@@ -15,11 +15,6 @@ impl BindGroup {
     pub fn id(&self) -> BindGroupId {
         self.id
     }
-
-    #[inline]
-    pub fn value(&self) -> &wgpu::BindGroup {
-        &self.value
-    }
 }
 
 impl From<wgpu::BindGroup> for BindGroup {
@@ -30,3 +25,12 @@ impl From<wgpu::BindGroup> for BindGroup {
         }
     }
 }
+
+impl Deref for BindGroup {
+    type Target = wgpu::BindGroup;
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        &self.value
+    }
+}

pipelined/bevy_render2/src/render_resource/mod.rs

@@ -2,15 +2,13 @@ mod bind_group;
 mod buffer;
 mod buffer_vec;
 mod pipeline;
-mod render_resource_id;
 mod texture;
 mod uniform_vec;
 
 pub use bind_group::*;
 pub use buffer::*;
 pub use buffer_vec::*;
 pub use pipeline::*;
-pub use render_resource_id::*;
 pub use texture::*;
 pub use uniform_vec::*;
 

pipelined/bevy_render2/src/render_resource/texture.rs

@@ -124,34 +124,3 @@ impl Deref for Sampler {
         &self.value
     }
 }
-
-#[derive(Clone, Debug)]
-pub struct SwapChainFrame {
-    id: TextureViewId,
-    value: Arc<wgpu::SwapChainFrame>,
-}
-
-impl SwapChainFrame {
-    #[inline]
-    pub fn id(&self) -> TextureViewId {
-        self.id
-    }
-}
-
-impl From<wgpu::SwapChainFrame> for SwapChainFrame {
-    fn from(value: wgpu::SwapChainFrame) -> Self {
-        Self {
-            id: TextureViewId(Uuid::new_v4()),
-            value: Arc::new(value),
-        }
-    }
-}
-
-impl Deref for SwapChainFrame {
-    type Target = wgpu::SwapChainFrame;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}