mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 23:11:01 +01:00
1 parent
2525d6ce9d
commit
b44b5eded9
5 files changed
+27
-3
No files matched your search
@@ -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<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
.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<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
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<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
.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<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
start_query..end_query,
|
||||
dst_buffer.raw.as_ref().unwrap(),
|
||||
destination_offset,
|
||||
wgt::BufferSize::new_unchecked(stride as u64),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -279,6 +279,7 @@ impl crate::CommandEncoder<Api> for Encoder {
|
||||
range: Range<u32>,
|
||||
buffer: &Resource,
|
||||
offset: wgt::BufferAddress,
|
||||
stride: wgt::BufferSize,
|
||||
) {
|
||||
}
|
||||
|
||||
|
||||
@@ -398,6 +398,7 @@ pub trait CommandEncoder<A: Api>: Send + Sync {
|
||||
range: Range<u32>,
|
||||
buffer: &A::Buffer,
|
||||
offset: wgt::BufferAddress,
|
||||
stride: wgt::BufferSize,
|
||||
);
|
||||
|
||||
// render passes
|
||||
|
||||
@@ -296,6 +296,7 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
|
||||
range: Range<u32>,
|
||||
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;
|
||||
|
||||
@@ -331,6 +331,7 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
|
||||
range: Range<u32>,
|
||||
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<super::Api> for super::CommandEncoder {
|
||||
range.end - range.start,
|
||||
buffer.raw,
|
||||
offset,
|
||||
0,
|
||||
stride.get(),
|
||||
vk::QueryResultFlags::TYPE_64 | vk::QueryResultFlags::WAIT,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user