Fix problems

atlv24 · Apr 14, 2024 · 67710d7 · 67710d7
1 parent abdbb40
commit 67710d7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/examples/src/ray_cube_compute/mod.rs b/examples/src/ray_cube_compute/mod.rs
@@ -614,7 +614,7 @@ pub fn main() {
 #[wgpu_test::gpu_test]
 static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams {
     name: "ray_cube_compute",
-    image_path: "/examples/ray_cube_compute/screenshot.png",
+    image_path: "/examples/src/ray_cube_compute/screenshot.png",
     width: 1024,
     height: 768,
     optional_features: wgpu::Features::default(),

diff --git a/examples/src/ray_cube_fragment/mod.rs b/examples/src/ray_cube_fragment/mod.rs
@@ -380,7 +380,7 @@ pub fn main() {
 #[wgpu_test::gpu_test]
 static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams {
     name: "ray_cube_fragment",
-    image_path: "/examples/ray_cube_fragment/screenshot.png",
+    image_path: "/examples/src/ray_cube_fragment/screenshot.png",
     width: 1024,
     height: 768,
     optional_features: wgpu::Features::default(),

diff --git a/examples/src/ray_scene/mod.rs b/examples/src/ray_scene/mod.rs
@@ -556,7 +556,7 @@ pub fn main() {
 #[wgpu_test::gpu_test]
 static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams {
     name: "ray_cube_fragment",
-    image_path: "/examples/ray_cube_fragment/screenshot.png",
+    image_path: "/examples/src/ray_cube_fragment/screenshot.png",
     width: 1024,
     height: 768,
     optional_features: wgpu::Features::default(),

diff --git a/wgpu-core/src/command/ray_tracing.rs b/wgpu-core/src/command/ray_tracing.rs
@@ -702,7 +702,10 @@ impl Global {
                 raw: Mutex::new(Some(scratch_buffer)),
                 device: device.clone(),
                 size: max(scratch_buffer_blas_size, scratch_buffer_tlas_size),
-                info: ResourceInfo::new("Raytracing scratch buffer", None),
+                info: ResourceInfo::new(
+                    "Raytracing scratch buffer",
+                    Some(device.tracker_indices.tlas_s.clone()),
+                ),
                 is_coherent: scratch_mapping.is_coherent,
             })));
 
@@ -1346,7 +1349,10 @@ impl Global {
                     raw: Mutex::new(Some(staging_buffer)),
                     device: device.clone(),
                     size: instance_buffer_staging_source.len() as u64,
-                    info: ResourceInfo::new("Raytracing staging buffer", None),
+                    info: ResourceInfo::new(
+                        "Raytracing scratch buffer",
+                        Some(device.tracker_indices.tlas_s.clone()),
+                    ),
                     is_coherent: mapping.is_coherent,
                 };
                 let staging_fid = hub.staging_buffers.request();
@@ -1534,7 +1540,10 @@ impl Global {
             raw: Mutex::new(Some(scratch_buffer)),
             device: device.clone(),
             size: max(scratch_buffer_blas_size, scratch_buffer_tlas_size),
-            info: ResourceInfo::new("Raytracing scratch buffer", None),
+            info: ResourceInfo::new(
+                "Raytracing scratch buffer",
+                Some(device.tracker_indices.tlas_s.clone()),
+            ),
             is_coherent: scratch_mapping.is_coherent,
         };
         let staging_fid = hub.staging_buffers.request();