From d785da86ce5e47b5f78d8bc3db6310a56bf683ff Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Sat, 4 Sep 2021 22:24:15 -0400 Subject: [PATCH] Properly implement timestamp periods (#1907) --- wgpu-core/src/device/queue.rs | 2 +- wgpu-hal/src/dx12/mod.rs | 6 ++++++ wgpu-hal/src/empty.rs | 4 ++++ wgpu-hal/src/gles/queue.rs | 4 ++++ wgpu-hal/src/lib.rs | 1 + wgpu-hal/src/metal/mod.rs | 5 +++++ wgpu-hal/src/vulkan/adapter.rs | 2 +- wgpu-hal/src/vulkan/mod.rs | 6 +++++- 8 files changed, 27 insertions(+), 3 deletions(-) diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index e3023b238..8fcb3ef04 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -836,7 +836,7 @@ impl Global { let mut token = Token::root(); let (device_guard, _) = hub.devices.read(&mut token); match device_guard.get(queue_id) { - Ok(_device) => Ok(1.0), //TODO? + Ok(device) => Ok(unsafe { device.queue.get_timestamp_period() }), Err(_) => Err(InvalidQueue), } } diff --git a/wgpu-hal/src/dx12/mod.rs b/wgpu-hal/src/dx12/mod.rs index 6d5931457..0132ee860 100644 --- a/wgpu-hal/src/dx12/mod.rs +++ b/wgpu-hal/src/dx12/mod.rs @@ -746,4 +746,10 @@ impl crate::Queue for Queue { Ok(()) } + + unsafe fn get_timestamp_period(&self) -> f32 { + let mut frequency = 0u64; + self.raw.GetTimestampFrequency(&mut frequency); + (1_000_000_000.0 / frequency as f64) as f32 + } } diff --git a/wgpu-hal/src/empty.rs b/wgpu-hal/src/empty.rs index e98ab94aa..33ad3e13e 100644 --- a/wgpu-hal/src/empty.rs +++ b/wgpu-hal/src/empty.rs @@ -103,6 +103,10 @@ impl crate::Queue for Context { ) -> Result<(), crate::SurfaceError> { Ok(()) } + + unsafe fn get_timestamp_period(&self) -> f32 { + 1.0 + } } impl crate::Device for Context { diff --git a/wgpu-hal/src/gles/queue.rs b/wgpu-hal/src/gles/queue.rs index 09e6d92c5..2de2c25e5 100644 --- a/wgpu-hal/src/gles/queue.rs +++ b/wgpu-hal/src/gles/queue.rs @@ -972,4 +972,8 @@ impl crate::Queue for super::Queue { let gl = &self.shared.context.get_without_egl_lock(); surface.present(texture, gl) } + + unsafe fn get_timestamp_period(&self) -> f32 { + 1.0 + } } diff --git a/wgpu-hal/src/lib.rs b/wgpu-hal/src/lib.rs index 0ae68323c..c3f9b28cf 100644 --- a/wgpu-hal/src/lib.rs +++ b/wgpu-hal/src/lib.rs @@ -314,6 +314,7 @@ pub trait Queue: Send + Sync { surface: &mut A::Surface, texture: A::SurfaceTexture, ) -> Result<(), SurfaceError>; + unsafe fn get_timestamp_period(&self) -> f32; } /// Encoder for commands in command buffers. diff --git a/wgpu-hal/src/metal/mod.rs b/wgpu-hal/src/metal/mod.rs index 7b95588f4..a249a4628 100644 --- a/wgpu-hal/src/metal/mod.rs +++ b/wgpu-hal/src/metal/mod.rs @@ -378,6 +378,11 @@ impl crate::Queue for Queue { }); Ok(()) } + + unsafe fn get_timestamp_period(&self) -> f32 { + // TODO: This is hard, see https://github.com/gpuweb/gpuweb/issues/1325 + 1.0 + } } #[derive(Debug)] diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs index 0262dd61e..8cb8cb88e 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -858,7 +858,7 @@ impl super::Adapter { vendor_id: self.phd_capabilities.properties.vendor_id, downlevel_flags: self.downlevel_flags, private_caps: self.private_caps.clone(), - _timestamp_period: self.phd_capabilities.properties.limits.timestamp_period, + timestamp_period: self.phd_capabilities.properties.limits.timestamp_period, render_passes: Mutex::new(Default::default()), framebuffers: Mutex::new(Default::default()), }); diff --git a/wgpu-hal/src/vulkan/mod.rs b/wgpu-hal/src/vulkan/mod.rs index 8a8b732c5..93fadad6a 100644 --- a/wgpu-hal/src/vulkan/mod.rs +++ b/wgpu-hal/src/vulkan/mod.rs @@ -221,7 +221,7 @@ struct DeviceShared { instance: Arc, extension_fns: DeviceExtensionFunctions, vendor_id: u32, - _timestamp_period: f32, + timestamp_period: f32, downlevel_flags: wgt::DownlevelFlags, private_caps: PrivateCapabilities, render_passes: Mutex>, @@ -540,6 +540,10 @@ impl crate::Queue for Queue { } Ok(()) } + + unsafe fn get_timestamp_period(&self) -> f32 { + self.device.timestamp_period + } } impl From for crate::DeviceError {