fix issues with tests

gfx-rs · Sep 14, 2024 · 3b573c8 · 3b573c8
1 parent 7400129
commit 3b573c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/examples/src/ray_cube_compute/mod.rs b/examples/src/ray_cube_compute/mod.rs
@@ -356,7 +356,7 @@ impl crate::framework::Example for Example {
         });
 
         let blas_geo_size_desc = rt::BlasTriangleGeometrySizeDescriptor {
-            vertex_format: wgpu::VertexFormat::Float32x4,
+            vertex_format: wgpu::VertexFormat::Float32x3,
             vertex_count: vertex_data.len() as u32,
             index_format: Some(wgpu::IndexFormat::Uint16),
             index_count: Some(index_data.len() as u32),

diff --git a/examples/src/ray_cube_fragment/mod.rs b/examples/src/ray_cube_fragment/mod.rs
@@ -166,7 +166,7 @@ impl crate::framework::Example for Example {
         });
 
         let blas_geo_size_desc = rt::BlasTriangleGeometrySizeDescriptor {
-            vertex_format: wgpu::VertexFormat::Float32x4,
+            vertex_format: wgpu::VertexFormat::Float32x3,
             vertex_count: vertex_data.len() as u32,
             index_format: Some(wgpu::IndexFormat::Uint16),
             index_count: Some(index_data.len() as u32),

diff --git a/tests/tests/buffer_usages.rs b/tests/tests/buffer_usages.rs
@@ -21,7 +21,8 @@ const NEEDS_MAPPABLE_PRIMARY_BUFFERS: &[Bu; 7] = &[
     Bu::MAP_WRITE.union(Bu::MAP_READ),
     Bu::MAP_READ.union(Bu::COPY_DST.union(Bu::STORAGE)),
     Bu::MAP_WRITE.union(Bu::COPY_SRC.union(Bu::STORAGE)),
-    Bu::all(),
+    // these two require acceleration_structures feature
+    Bu::all().intersection(Bu::BLAS_INPUT.union(Bu::TLAS_INPUT).complement()),
 ];
 const INVALID_BITS: Bu = Bu::from_bits_retain(0b1111111111111);
 const ALWAYS_FAIL: &[Bu; 2] = &[Bu::empty(), INVALID_BITS];

diff --git a/tests/tests/ray_tracing/mod.rs b/tests/tests/ray_tracing/mod.rs
@@ -39,7 +39,7 @@ fn execute(ctx: TestingContext) {
     });
 
     let blas_geo_size_desc = rt::BlasTriangleGeometrySizeDescriptor {
-        vertex_format: wgpu::VertexFormat::Float32x4,
+        vertex_format: wgpu::VertexFormat::Float32x3,
         vertex_count: vertex_data.len() as u32,
         index_format: Some(wgpu::IndexFormat::Uint16),
         index_count: Some(index_data.len() as u32),