comment & clippy fixes

Author: Wumpf

wgpu-core/src/command/memory_init.rs

@@ -55,20 +55,21 @@ impl CommandBufferTextureMemoryActions {
         action: &TextureInitTrackerAction,
         texture_guard: &Storage<Texture<A>, TextureId>,
     ) -> SurfacesInDiscardState {
-        // TODO: Do not add MemoryInitKind::NeedsInitializedMemory to init_actions if a surface is part of the discard list
-        // in that case it doesn't need to be initialized prior to the command buffer execution
+        let mut immediately_necessary_clears = SurfacesInDiscardState::new();
 
         // Note that within a command buffer we may stack arbitrary memory init actions on the same texture
         // Since we react to them in sequence, they are going to be dropped again at queue submit
+        //
+        // We don't need to add MemoryInitKind::NeedsInitializedMemory to init_actions if a surface is part of the discard list.
+        // But that would mean splitting up the action which is more than we'd win here.
         self.init_actions
             .extend(match texture_guard.get(action.id) {
                 Ok(texture) => texture.initialization_status.check_action(action),
-                Err(_) => None,
+                Err(_) => return immediately_necessary_clears, // texture no longer exists
             });
 
         // We expect very few discarded surfaces at any point in time which is why a simple linear search is likely best.
         // (i.e. most of the time self.discards is empty!)
-        let mut immediately_necessary_clears = SurfacesInDiscardState::new();
         self.discards.retain(|discarded_surface| {
             if discarded_surface.texture == action.id
                 && action.range.layer_range.contains(&discarded_surface.layer)
@@ -335,7 +336,7 @@ impl<A: hal::Api> BakedCommands<A> {
                         }
                     }
 
-                    if zero_buffer_copy_regions.len() > 0 {
+                    if !zero_buffer_copy_regions.is_empty() {
                         unsafe {
                             self.encoder.copy_buffer_to_texture(
                                 &device.zero_buffer,

wgpu-core/src/command/render.rs

@@ -647,27 +647,20 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> {
                 ));
             }
 
-            if !ds_aspects.contains(hal::FormatAspects::DEPTH) {
-                Self::add_pass_texture_init_actions(
-                    &at.stencil,
-                    &mut cmd_buf.texture_memory_actions,
-                    view,
-                    texture_guard,
-                    &mut pending_discard_init_fixups,
-                );
-            } else if !ds_aspects.contains(hal::FormatAspects::STENCIL) {
+            if !ds_aspects.contains(hal::FormatAspects::STENCIL)
+                || (at.stencil.load_op == at.depth.load_op
+                    && at.stencil.store_op == at.depth.store_op)
+            {
                 Self::add_pass_texture_init_actions(
                     &at.depth,
                     &mut cmd_buf.texture_memory_actions,
                     view,
                     texture_guard,
                     &mut pending_discard_init_fixups,
                 );
-            } else if at.stencil.load_op == at.depth.load_op
-                && at.stencil.store_op == at.depth.store_op
-            {
+            } else if !ds_aspects.contains(hal::FormatAspects::DEPTH) {
                 Self::add_pass_texture_init_actions(
-                    &at.depth,
+                    &at.stencil,
                     &mut cmd_buf.texture_memory_actions,
                     view,
                     texture_guard,

wgpu-core/src/device/queue.rs

@@ -534,7 +534,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
 
             let layers_to_initialize = dst.initialization_status.mips
                 [destination.mip_level as usize]
-                .drain(init_layer_range.clone());
+                .drain(init_layer_range);
 
             let mut zero_buffer_copy_regions = Vec::new();
             if size.width == dst.desc.size.width && size.height == dst.desc.size.height {
@@ -551,7 +551,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 }
             }
             unsafe {
-                if zero_buffer_copy_regions.len() > 0 {
+                if !zero_buffer_copy_regions.is_empty() {
                     encoder.copy_buffer_to_texture(
                         &device.zero_buffer,
                         dst_raw,
@@ -787,7 +787,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                             .initialize_buffer_memory(&mut *trackers, &mut *buffer_guard)
                             .map_err(|err| QueueSubmitError::DestroyedBuffer(err.0))?;
                         baked
-                            .initialize_texture_memory(&mut *trackers, &mut *texture_guard, &device)
+                            .initialize_texture_memory(&mut *trackers, &mut *texture_guard, device)
                             .map_err(|err| QueueSubmitError::DestroyedTexture(err.0))?;
                         //Note: stateless trackers are not merged:
                         // device already knows these resources exist.

wgpu/tests/zero_init_texture_after_discard.rs

@@ -265,7 +265,7 @@ fn copy_texture_to_buffer(
 ) {
     encoder.copy_texture_to_buffer(
         wgpu::ImageCopyTexture {
-            texture: &texture,
+            texture,
             mip_level: 0,
             origin: wgpu::Origin3d { x: 0, y: 0, z: 0 },
             aspect: wgpu::TextureAspect::All,