diff --git a/CHANGELOG.md b/CHANGELOG.md index 63df4e8b2..0b3f3335b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -170,6 +170,7 @@ depth_stencil: Some(wgpu::DepthStencilState::stencil( - BREAKING: End offsets in trace and `player` commands are now represented using `offset` + `size` instead. By @ErichDonGubler in [9073](https://github.com/gfx-rs/wgpu/pull/9073). - Validate some uncaught cases where buffer transfer operations could overflow when computing an end offset. By @ErichDonGubler in [9073](https://github.com/gfx-rs/wgpu/pull/9073). - Added internal labels to validation GPU objects and timestamp normalization code to improve clarity in graphics debuggers. By @szostid in [9094](https://github.com/gfx-rs/wgpu/pull/9094) +- Fix multi-planar texture copying. By @noituri [#9069](https://github.com/gfx-rs/wgpu/pull/9069) #### naga diff --git a/tests/tests/wgpu-gpu/planar_texture/mod.rs b/tests/tests/wgpu-gpu/planar_texture/mod.rs index 0ceb2a195..2fd965b36 100644 --- a/tests/tests/wgpu-gpu/planar_texture/mod.rs +++ b/tests/tests/wgpu-gpu/planar_texture/mod.rs @@ -9,6 +9,8 @@ pub fn all_tests(tests: &mut Vec) { NV12_TEXTURE_CREATION_SAMPLING, P010_TEXTURE_CREATION_SAMPLING, NV12_TEXTURE_RENDERING, + NV12_TEXTURE_COPYING, + P010_TEXTURE_COPYING, ]); } @@ -338,3 +340,97 @@ static NV12_TEXTURE_RENDERING: GpuTestConfiguration = GpuTestConfiguration::new( (&uv_view, wgpu::TextureFormat::Rg8Unorm), ); }); + +/// Ensures that copying NV12 texture to NV12 texture works as expected +#[gpu_test] +static NV12_TEXTURE_COPYING: GpuTestConfiguration = GpuTestConfiguration::new() + .parameters( + TestParameters::default() + .features(wgpu::Features::TEXTURE_FORMAT_NV12) + .enable_noop(), + ) + .run_sync(|ctx| { + let size = wgpu::Extent3d { + width: 256, + height: 256, + depth_or_array_layers: 1, + }; + let input_texture = ctx.device.create_texture(&wgpu::TextureDescriptor { + label: None, + dimension: wgpu::TextureDimension::D2, + size, + format: wgpu::TextureFormat::NV12, + usage: wgpu::TextureUsages::COPY_SRC, + mip_level_count: 1, + sample_count: 1, + view_formats: &[], + }); + let output_texture = ctx.device.create_texture(&wgpu::TextureDescriptor { + label: None, + dimension: wgpu::TextureDimension::D2, + size, + format: wgpu::TextureFormat::NV12, + usage: wgpu::TextureUsages::COPY_DST, + mip_level_count: 1, + sample_count: 1, + view_formats: &[], + }); + + let mut command_encoder = ctx + .device + .create_command_encoder(&wgpu::CommandEncoderDescriptor::default()); + command_encoder.copy_texture_to_texture( + input_texture.as_image_copy(), + output_texture.as_image_copy(), + size, + ); + ctx.queue.submit([command_encoder.finish()]); + }); + +/// Ensures that copying P010 texture to P010 texture works as expected +#[gpu_test] +static P010_TEXTURE_COPYING: GpuTestConfiguration = GpuTestConfiguration::new() + .parameters( + TestParameters::default() + .features( + wgpu::Features::TEXTURE_FORMAT_P010 | wgpu::Features::TEXTURE_FORMAT_16BIT_NORM, + ) + .enable_noop(), + ) + .run_sync(|ctx| { + let size = wgpu::Extent3d { + width: 256, + height: 256, + depth_or_array_layers: 1, + }; + let input_texture = ctx.device.create_texture(&wgpu::TextureDescriptor { + label: None, + dimension: wgpu::TextureDimension::D2, + size, + format: wgpu::TextureFormat::P010, + usage: wgpu::TextureUsages::COPY_SRC, + mip_level_count: 1, + sample_count: 1, + view_formats: &[], + }); + let output_texture = ctx.device.create_texture(&wgpu::TextureDescriptor { + label: None, + dimension: wgpu::TextureDimension::D2, + size, + format: wgpu::TextureFormat::P010, + usage: wgpu::TextureUsages::COPY_DST, + mip_level_count: 1, + sample_count: 1, + view_formats: &[], + }); + + let mut command_encoder = ctx + .device + .create_command_encoder(&wgpu::CommandEncoderDescriptor::default()); + command_encoder.copy_texture_to_texture( + input_texture.as_image_copy(), + output_texture.as_image_copy(), + size, + ); + ctx.queue.submit([command_encoder.finish()]); + }); diff --git a/wgpu-core/src/command/transfer.rs b/wgpu-core/src/command/transfer.rs index 7151e9a40..3c659405b 100644 --- a/wgpu-core/src/command/transfer.rs +++ b/wgpu-core/src/command/transfer.rs @@ -1468,6 +1468,8 @@ pub(super) fn copy_texture_to_texture( depth: src_copy_size.depth.min(dst_copy_size.depth), }; + let dst_format = dst_texture.desc.format; + let regions = (0..array_layer_count).map(|rel_array_layer| { let mut src_base = src_tex_base.clone(); let mut dst_base = dst_tex_base.clone(); @@ -1491,6 +1493,33 @@ pub(super) fn copy_texture_to_texture( [depth, stencil] }) .collect::>() + } else if let Some(plane_count) = dst_format.planes() { + regions + .into_iter() + .flat_map(|region| { + (0..plane_count).map(move |plane| { + let mut plane_region = region.clone(); + + let plane_aspect = wgt::TextureAspect::from_plane(plane) + .expect("expected texture aspect to exist for the plane"); + let plane_aspect = hal::FormatAspects::new(dst_format, plane_aspect); + plane_region.src_base.aspect = plane_aspect; + plane_region.dst_base.aspect = plane_aspect; + + let (w_subsampling, h_subsampling) = + dst_format.subsampling_factors(Some(plane)); + plane_region.src_base.origin.x /= w_subsampling; + plane_region.src_base.origin.y /= h_subsampling; + plane_region.dst_base.origin.x /= w_subsampling; + plane_region.dst_base.origin.y /= h_subsampling; + + plane_region.size.width /= w_subsampling; + plane_region.size.height /= h_subsampling; + + plane_region + }) + }) + .collect::>() } else { regions.collect::>() }; diff --git a/wgpu-hal/src/dx12/mod.rs b/wgpu-hal/src/dx12/mod.rs index 78e12ccb1..aa74b88ae 100644 --- a/wgpu-hal/src/dx12/mod.rs +++ b/wgpu-hal/src/dx12/mod.rs @@ -966,8 +966,11 @@ impl Texture { fn calc_subresource_for_copy(&self, base: &crate::TextureCopyBase) -> u32 { let plane = match base.aspect { - crate::FormatAspects::COLOR | crate::FormatAspects::DEPTH => 0, - crate::FormatAspects::STENCIL => 1, + crate::FormatAspects::COLOR + | crate::FormatAspects::DEPTH + | crate::FormatAspects::PLANE_0 => 0, + crate::FormatAspects::STENCIL | crate::FormatAspects::PLANE_1 => 1, + crate::FormatAspects::PLANE_2 => 2, _ => unreachable!(), }; self.calc_subresource(base.mip_level, base.array_layer, plane)