diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index f718e84a2..631537f5d 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -1841,10 +1841,18 @@ impl Queue { Ok(SubmissionResult { snatch_guard }) } - pub fn get_timestamp_period(&self) -> f32 { + pub(crate) fn get_raw_timestamp_period(&self) -> f32 { unsafe { self.raw().get_timestamp_period() } } + pub fn get_timestamp_period(&self) -> f32 { + if self.device.timestamp_normalizer.get().unwrap().enabled() { + return 1.0; + } + + self.get_raw_timestamp_period() + } + /// `closure` is guaranteed to be called. pub fn on_submitted_work_done( &self, @@ -2101,10 +2109,6 @@ impl Global { pub fn queue_get_timestamp_period(&self, queue_id: QueueId) -> f32 { let queue = self.hub.queues.get(queue_id); - if queue.device.timestamp_normalizer.get().unwrap().enabled() { - return 1.0; - } - queue.get_timestamp_period() } diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs index 59834a455..f5b229b9e 100644 --- a/wgpu-core/src/device/resource.rs +++ b/wgpu-core/src/device/resource.rs @@ -765,7 +765,7 @@ impl Device { let timestamp_normalizer = crate::timestamp_normalization::TimestampNormalizer::new( self, - queue.get_timestamp_period(), + queue.get_raw_timestamp_period(), )?; self.timestamp_normalizer