fix tests, doctests and wasm build (#62)

Wumpf · Feb 7, 2024 · 5f3debd · 5f3debd
1 parent 47f2e5d
commit 5f3debd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -16,7 +16,7 @@ use wgpu_profiler::*;
     # let (device, queue) = adapter
     #     .request_device(
     #         &wgpu::DeviceDescriptor {
-    #             features: wgpu::Features::TIMESTAMP_QUERY,
+    #             required_features: wgpu::Features::TIMESTAMP_QUERY,
     #             ..Default::default()
     #         },
     #         None,

diff --git a/src/profiler.rs b/src/profiler.rs
@@ -683,9 +683,15 @@ impl GpuProfiler {
             None
         };
 
+        let pid = if cfg!(target_arch = "wasm32") {
+            0
+        } else {
+            std::process::id()
+        };
+
         GpuProfilerQuery {
             label,
-            pid: std::process::id(),
+            pid,
             tid: std::thread::current().id(),
             timer_query_pair: query,
             handle: self.next_scope_tree_handle(),

diff --git a/tests/src/errors.rs b/tests/src/errors.rs
@@ -18,7 +18,7 @@ fn invalid_pending_frame_count() {
 
 #[test]
 fn end_frame_unclosed_query() {
-    let (_, device, _) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
+    let (_, device, _queue) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
 
     let mut profiler = wgpu_profiler::GpuProfiler::new(GpuProfilerSettings::default()).unwrap();
     let unclosed_query = {
@@ -44,7 +44,7 @@ fn end_frame_unclosed_query() {
 
 #[test]
 fn end_frame_unresolved_query() {
-    let (_, device, _) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
+    let (_, device, _queue) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
 
     let mut profiler = wgpu_profiler::GpuProfiler::new(GpuProfilerSettings::default()).unwrap();
     {
@@ -70,7 +70,7 @@ fn end_frame_unresolved_query() {
 
 #[test]
 fn change_settings_while_query_open() {
-    let (_, device, _) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
+    let (_, device, _queue) = create_device(wgpu::Features::TIMESTAMP_QUERY).unwrap();
 
     let mut profiler = wgpu_profiler::GpuProfiler::new(GpuProfilerSettings::default()).unwrap();
 

diff --git a/tests/src/mod.rs b/tests/src/mod.rs
@@ -22,7 +22,7 @@ pub fn create_device(
         let (device, queue) = adapter
             .request_device(
                 &wgpu::DeviceDescriptor {
-                    features,
+                    required_features: features,
                     ..Default::default()
                 },
                 None,