diff --git a/wgpu-core/src/command/query.rs b/wgpu-core/src/command/query.rs index 9a5750d6f..3da0d9cfc 100644 --- a/wgpu-core/src/command/query.rs +++ b/wgpu-core/src/command/query.rs @@ -6,6 +6,7 @@ use crate::{ command::{CommandBuffer, CommandEncoderError}, hub::{Global, GlobalIdentityHandlerFactory, HalApi, Storage, Token}, id::{self, Id, TypedId}, + memory_init_tracker::{MemoryInitKind, MemoryInitTrackerAction}, resource::QuerySet, track::UseExtendError, Epoch, FastHashMap, Index, @@ -368,7 +369,14 @@ impl Global { .into()); } - let bytes_used = (wgt::QUERY_SIZE * query_count) as BufferAddress; + let elements_per_query = match query_set.desc.ty { + wgt::QueryType::Occlusion => 1, + wgt::QueryType::PipelineStatistics(ps) => ps.bits().count_ones(), + wgt::QueryType::Timestamp => 1, + }; + let stride = elements_per_query * wgt::QUERY_SIZE; + let bytes_used = (stride * query_count) as BufferAddress; + let buffer_start_offset = destination_offset; let buffer_end_offset = buffer_start_offset + bytes_used; @@ -376,7 +384,7 @@ impl Global { return Err(ResolveError::BufferOverrun { start_query, end_query, - stride: wgt::QUERY_SIZE, + stride, buffer_size: dst_buffer.size, buffer_start_offset, buffer_end_offset, @@ -384,6 +392,17 @@ impl Global { .into()); } + cmd_buf.buffer_memory_init_actions.extend( + dst_buffer + .initialization_status + .check(buffer_start_offset..buffer_end_offset) + .map(|range| MemoryInitTrackerAction { + id: destination, + range, + kind: MemoryInitKind::ImplicitlyInitialized, + }), + ); + unsafe { raw_encoder.transition_buffers(dst_barrier); raw_encoder.copy_query_results( @@ -391,6 +410,7 @@ impl Global { start_query..end_query, dst_buffer.raw.as_ref().unwrap(), destination_offset, + wgt::BufferSize::new_unchecked(stride as u64), ); } diff --git a/wgpu-hal/src/empty.rs b/wgpu-hal/src/empty.rs index 536fa707e..a2682e26c 100644 --- a/wgpu-hal/src/empty.rs +++ b/wgpu-hal/src/empty.rs @@ -279,6 +279,7 @@ impl crate::CommandEncoder for Encoder { range: Range, buffer: &Resource, offset: wgt::BufferAddress, + stride: wgt::BufferSize, ) { } diff --git a/wgpu-hal/src/lib.rs b/wgpu-hal/src/lib.rs index 456f70c46..6fc38acff 100644 --- a/wgpu-hal/src/lib.rs +++ b/wgpu-hal/src/lib.rs @@ -398,6 +398,7 @@ pub trait CommandEncoder: Send + Sync { range: Range, buffer: &A::Buffer, offset: wgt::BufferAddress, + stride: wgt::BufferSize, ); // render passes diff --git a/wgpu-hal/src/metal/command.rs b/wgpu-hal/src/metal/command.rs index 902274fc1..1b6d9ec90 100644 --- a/wgpu-hal/src/metal/command.rs +++ b/wgpu-hal/src/metal/command.rs @@ -296,6 +296,7 @@ impl crate::CommandEncoder for super::CommandEncoder { range: Range, buffer: &super::Buffer, offset: wgt::BufferAddress, + _: wgt::BufferSize, // Metal doesn't support queries that are bigger than a single element are not supported ) { let encoder = self.enter_blit(); let size = (range.end - range.start) as u64 * crate::QUERY_SIZE; diff --git a/wgpu-hal/src/vulkan/command.rs b/wgpu-hal/src/vulkan/command.rs index 1f2894f0b..32d483107 100644 --- a/wgpu-hal/src/vulkan/command.rs +++ b/wgpu-hal/src/vulkan/command.rs @@ -331,6 +331,7 @@ impl crate::CommandEncoder for super::CommandEncoder { range: Range, buffer: &super::Buffer, offset: wgt::BufferAddress, + stride: wgt::BufferSize, ) { self.device.raw.cmd_copy_query_pool_results( self.active, @@ -339,7 +340,7 @@ impl crate::CommandEncoder for super::CommandEncoder { range.end - range.start, buffer.raw, offset, - 0, + stride.get(), vk::QueryResultFlags::TYPE_64 | vk::QueryResultFlags::WAIT, ); }