 992681b59b
			
		
	
	
		992681b59b
		
	
	
	
	
		
			
			*This PR description is an edited copy of #5007, written by @alice-i-cecile.* # Objective Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds. While ergonomic, this results in several drawbacks: * it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource * it is challenging to discover if a type is intended to be used as a resource * we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component). * dependencies can use the same Rust type as a resource in invisibly conflicting ways * raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values * we cannot capture a definitive list of possible resources to display to users in an editor ## Notes to reviewers * Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits. *ira: My commits are not as well organized :')* * I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does. * I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981. ## Changelog `Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro. ## Migration Guide Add `#[derive(Resource)]` to all types you are using as a resource. If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics. `ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing. Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead. Co-authored-by: Alice <alice.i.cecile@gmail.com> Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: devil-ira <justthecooldude@gmail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			102 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use crate::{
 | |
|     render_resource::{Texture, TextureView},
 | |
|     renderer::RenderDevice,
 | |
| };
 | |
| use bevy_ecs::{prelude::ResMut, system::Resource};
 | |
| use bevy_utils::{Entry, HashMap};
 | |
| use wgpu::{TextureDescriptor, TextureViewDescriptor};
 | |
| 
 | |
| /// The internal representation of a [`CachedTexture`] used to track whether it was recently used
 | |
| /// and is currently taken.
 | |
| struct CachedTextureMeta {
 | |
|     texture: Texture,
 | |
|     default_view: TextureView,
 | |
|     taken: bool,
 | |
|     frames_since_last_use: usize,
 | |
| }
 | |
| 
 | |
| /// A cached GPU [`Texture`] with corresponding [`TextureView`].
 | |
| /// This is useful for textures that are created repeatedly (each frame) in the rendering process
 | |
| /// to reduce the amount of GPU memory allocations.
 | |
| #[derive(Clone)]
 | |
| pub struct CachedTexture {
 | |
|     pub texture: Texture,
 | |
|     pub default_view: TextureView,
 | |
| }
 | |
| 
 | |
| /// This resource caches textures that are created repeatedly in the rendering process and
 | |
| /// are only required for one frame.
 | |
| #[derive(Resource, Default)]
 | |
| pub struct TextureCache {
 | |
|     textures: HashMap<wgpu::TextureDescriptor<'static>, Vec<CachedTextureMeta>>,
 | |
| }
 | |
| 
 | |
| impl TextureCache {
 | |
|     /// Retrieves a texture that matches the `descriptor`. If no matching one is found a new
 | |
|     /// [`CachedTexture`] is created.
 | |
|     pub fn get(
 | |
|         &mut self,
 | |
|         render_device: &RenderDevice,
 | |
|         descriptor: TextureDescriptor<'static>,
 | |
|     ) -> CachedTexture {
 | |
|         match self.textures.entry(descriptor) {
 | |
|             Entry::Occupied(mut entry) => {
 | |
|                 for texture in entry.get_mut().iter_mut() {
 | |
|                     if !texture.taken {
 | |
|                         texture.frames_since_last_use = 0;
 | |
|                         texture.taken = true;
 | |
|                         return CachedTexture {
 | |
|                             texture: texture.texture.clone(),
 | |
|                             default_view: texture.default_view.clone(),
 | |
|                         };
 | |
|                     }
 | |
|                 }
 | |
| 
 | |
|                 let texture = render_device.create_texture(&entry.key().clone());
 | |
|                 let default_view = texture.create_view(&TextureViewDescriptor::default());
 | |
|                 entry.get_mut().push(CachedTextureMeta {
 | |
|                     texture: texture.clone(),
 | |
|                     default_view: default_view.clone(),
 | |
|                     frames_since_last_use: 0,
 | |
|                     taken: true,
 | |
|                 });
 | |
|                 CachedTexture {
 | |
|                     texture,
 | |
|                     default_view,
 | |
|                 }
 | |
|             }
 | |
|             Entry::Vacant(entry) => {
 | |
|                 let texture = render_device.create_texture(entry.key());
 | |
|                 let default_view = texture.create_view(&TextureViewDescriptor::default());
 | |
|                 entry.insert(vec![CachedTextureMeta {
 | |
|                     texture: texture.clone(),
 | |
|                     default_view: default_view.clone(),
 | |
|                     taken: true,
 | |
|                     frames_since_last_use: 0,
 | |
|                 }]);
 | |
|                 CachedTexture {
 | |
|                     texture,
 | |
|                     default_view,
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /// Updates the cache and only retains recently used textures.
 | |
|     pub fn update(&mut self) {
 | |
|         for textures in self.textures.values_mut() {
 | |
|             for texture in textures.iter_mut() {
 | |
|                 texture.frames_since_last_use += 1;
 | |
|                 texture.taken = false;
 | |
|             }
 | |
| 
 | |
|             textures.retain(|texture| texture.frames_since_last_use < 3);
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Updates the [`TextureCache`] to only retains recently used textures.
 | |
| pub fn update_texture_cache_system(mut texture_cache: ResMut<TextureCache>) {
 | |
|     texture_cache.update();
 | |
| }
 |