chore: update tests, one failing

wgpu-core/src/command/render.rs

@@ -1227,7 +1227,7 @@ impl<'a, A: HalApi> RenderPassInfo<'a, A> {
  clear_value: (0.0, 0),
  }),
  multiview: self.multiview,
- timestamp_writes: &[], //TODO
+ timestamp_writes: &[],
  };
  unsafe {
  raw.begin_render_pass(&desc);

wgpu-hal/examples/halmark/main.rs

@@ -679,6 +679,7 @@ impl<A: hal::Api> Example<A> {
  })],
  depth_stencil_attachment: None,
  multiview: None,
+ timestamp_writes: &[],
  };
  unsafe {
  ctx.encoder.begin_render_pass(&pass_desc);

wgpu-hal/examples/raw-gles.rs

@@ -174,6 +174,7 @@ fn fill_screen(exposed: &hal::ExposedAdapter<hal::api::Gles>, width: u32, height
  })],
  depth_stencil_attachment: None,
  multiview: None,
+ timestamp_writes: &[],
  };
  unsafe {
  encoder.begin_encoding(None).unwrap();

wgpu/examples/boids/main.rs

@@ -286,6 +286,7 @@ impl framework::Example for Example {
  label: None,
  color_attachments: &color_attachments,
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  };
 
  // get command encoder
@@ -295,8 +296,10 @@ impl framework::Example for Example {
  command_encoder.push_debug_group("compute boid movement");
  {
  // compute pass
- let mut cpass =
- command_encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label: None });
+ let mut cpass = command_encoder.begin_compute_pass(&wgpu::ComputePassDescriptor {
+ label: None,
+ timestamp_writes: &[],
+ });
  cpass.set_pipeline(&self.compute_pipeline);
  cpass.set_bind_group(0, &self.particle_bind_groups[self.frame_num % 2], &[]);
  cpass.dispatch_workgroups(self.work_group_count, 1, 1);

wgpu/examples/bunnymark/main.rs

@@ -339,6 +339,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
  rpass.set_pipeline(&self.pipeline);
  rpass.set_bind_group(0, &self.global_group, &[]);

wgpu/examples/capture/main.rs

@@ -104,6 +104,7 @@ async fn create_red_image_with_dimensions(
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  // Copy the data from the texture to the buffer

wgpu/examples/conservative-raster/main.rs

@@ -276,6 +276,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&self.pipeline_triangle_conservative);
@@ -295,6 +296,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&self.pipeline_upscale);

wgpu/examples/cube/main.rs

@@ -379,6 +379,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
  rpass.push_debug_group("Prepare data for draw.");
  rpass.set_pipeline(&self.pipeline);

wgpu/examples/hello-compute/tests.rs

@@ -15,6 +15,7 @@ fn test_compute_1() {
  TestParameters::default()
  .downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS)
  .limits(wgpu::Limits::downlevel_defaults())
+ .features(wgpu::Features::TIMESTAMP_QUERY)
  .specific_failure(None, None, Some("V3D"), true),
  |ctx| {
  let input = &[1, 2, 3, 4];
@@ -36,6 +37,7 @@ fn test_compute_2() {
  TestParameters::default()
  .downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS)
  .limits(wgpu::Limits::downlevel_defaults())
+ .features(wgpu::Features::TIMESTAMP_QUERY)
  .specific_failure(None, None, Some("V3D"), true),
  |ctx| {
  let input = &[5, 23, 10, 9];
@@ -57,6 +59,7 @@ fn test_compute_overflow() {
  TestParameters::default()
  .downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS)
  .limits(wgpu::Limits::downlevel_defaults())
+ .features(wgpu::Features::TIMESTAMP_QUERY)
  .specific_failure(None, None, Some("V3D"), true),
  |ctx| {
  let input = &[77031, 837799, 8400511, 63728127];
@@ -77,6 +80,7 @@ fn test_multithreaded_compute() {
  TestParameters::default()
  .downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS)
  .limits(wgpu::Limits::downlevel_defaults())
+ .features(wgpu::Features::TIMESTAMP_QUERY)
  .specific_failure(None, None, Some("V3D"), true)
  // https://github.com/gfx-rs/wgpu/issues/3250
  .specific_failure(Some(wgpu::Backends::GL), None, Some("llvmpipe"), true),

wgpu/examples/hello-triangle/main.rs

@@ -182,13 +182,13 @@ async fn run(event_loop: EventLoop<()>, window: Window) {
 
 fn resolve_timestamps(destination_buffer: &wgpu::Buffer, timestamp_period: f32) {
  {
- let timestamp_view = destination_buffer
- .slice(..(std::mem::size_of::<u64>() * 2) as wgpu::BufferAddress)
- .get_mapped_range();
+  let timestamp_view = destination_buffer
+  .slice(..(std::mem::size_of::<u64>() * 2) as wgpu::BufferAddress)
+  .get_mapped_range();
 
- let timestamps: &[u64] = bytemuck::cast_slice(&timestamp_view);
- let elapsed_ns = (timestamps[1] - timestamps[0]) as f64 * timestamp_period as f64;
- log::info!("Elapsed time: {:.2} μs", elapsed_ns / 1000.0);
+  let timestamps: &[u64] = bytemuck::cast_slice(&timestamp_view);
+  let elapsed_ns = (timestamps[1] - timestamps[0]) as f64 * timestamp_period as f64;
+  log::info!("Elapsed time: {:.2} μs", elapsed_ns / 1000.0);
  }
  destination_buffer.unmap();
 }

wgpu/examples/hello-windows/main.rs

@@ -135,6 +135,7 @@ async fn run(event_loop: EventLoop<()>, viewports: Vec<(Window, wgpu::Color)>) {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
  }
 

wgpu/examples/mipmap/main.rs

@@ -163,6 +163,7 @@ impl Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
  if let Some(ref query_sets) = query_sets {
  rpass.write_timestamp(&query_sets.timestamp, timestamp_query_index_base);
@@ -474,6 +475,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
  rpass.set_pipeline(&self.draw_pipeline);
  rpass.set_bind_group(0, &self.bind_group, &[]);

wgpu/examples/msaa-line/main.rs

@@ -301,6 +301,7 @@ impl framework::Example for Example {
  label: None,
  color_attachments: &[Some(rpass_color_attachment)],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  })
  .execute_bundles(iter::once(&self.bundle));
  }

wgpu/examples/shadow/main.rs

@@ -780,6 +780,7 @@ impl framework::Example for Example {
  }),
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
  pass.set_pipeline(&self.shadow_pass.pipeline);
  pass.set_bind_group(0, &self.shadow_pass.bind_group, &[]);
@@ -822,6 +823,7 @@ impl framework::Example for Example {
  }),
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
  pass.set_pipeline(&self.forward_pass.pipeline);
  pass.set_bind_group(0, &self.forward_pass.bind_group, &[]);

wgpu/examples/skybox/main.rs

@@ -442,6 +442,7 @@ impl framework::Example for Skybox {
  }),
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
 
  rpass.set_bind_group(0, &self.bind_group, &[]);

wgpu/examples/stencil-triangles/main.rs

@@ -214,6 +214,7 @@ impl framework::Example for Triangles {
  store: true,
  }),
  }),
+ timestamp_writes: &[],
  });
 
  rpass.set_stencil_reference(1);

wgpu/examples/texture-arrays/main.rs

@@ -386,6 +386,7 @@ impl framework::Example for Example {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&self.pipeline);

wgpu/examples/water/main.rs

@@ -755,6 +755,7 @@ impl framework::Example for Example {
  }),
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
 
  rpass.execute_bundles([&self.terrain_bundle]);
@@ -780,6 +781,7 @@ impl framework::Example for Example {
  }),
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
  rpass.set_pipeline(&self.terrain_pipeline);
  rpass.set_bind_group(0, &self.terrain_normal_bind_group, &[]);
@@ -804,6 +806,7 @@ impl framework::Example for Example {
  depth_ops: None,
  stencil_ops: None,
  }),
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&self.water_pipeline);

wgpu/tests/regression/issue_3457.rs

@@ -141,6 +141,7 @@ fn pass_reset_vertex_buffer() {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  double_rpass.set_pipeline(&double_pipeline);
@@ -174,6 +175,7 @@ fn pass_reset_vertex_buffer() {
  },
  })],
  depth_stencil_attachment: None,
+ timestamp_writes: &[],
  });
 
  single_rpass.set_pipeline(&single_pipeline);

wgpu/tests/shader/mod.rs

@@ -326,6 +326,7 @@ fn shader_input_output_test(
 
  let mut cpass = encoder.begin_compute_pass(&ComputePassDescriptor {
  label: Some(&format!("cpass {test_name}")),
+ timestamp_writes: &[],
  });
  cpass.set_pipeline(&pipeline);
  cpass.set_bind_group(0, &bg, &[]);

wgpu/tests/shader_primitive_index/mod.rs

@@ -183,6 +183,7 @@ fn pulling_common(
  })],
  depth_stencil_attachment: None,
  label: None,
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&pipeline);

wgpu/tests/shader_view_format/mod.rs

@@ -137,6 +137,7 @@ fn reinterpret(
  })],
  depth_stencil_attachment: None,
  label: None,
+ timestamp_writes: &[],
  });
  rpass.set_pipeline(&pipeline);
  rpass.set_bind_group(0, &bind_group, &[]);

wgpu/tests/vertex_indices/mod.rs

@@ -115,6 +115,7 @@ fn pulling_common(
  })],
  depth_stencil_attachment: None,
  label: None,
+ timestamp_writes: &[],
  });
 
  rpass.set_pipeline(&pipeline);

wgpu/tests/zero_init_texture_after_discard.rs

@@ -160,6 +160,7 @@ impl<'ctx> TestCase<'ctx> {
  store: true,
  }),
  }),
+ timestamp_writes: &[],
  });
  ctx.queue.submit([encoder.finish()]);
  } else {
@@ -243,6 +244,7 @@ impl<'ctx> TestCase<'ctx> {
  }),
  },
  ),
+ timestamp_writes: &[],
  });
  }
 
@@ -266,6 +268,7 @@ impl<'ctx> TestCase<'ctx> {
  }),
  },
  ),
+ timestamp_writes: &[],
  });
  }
 
@@ -289,6 +292,7 @@ impl<'ctx> TestCase<'ctx> {
  }),
  },
  ),
+ timestamp_writes: &[],
  });
  }