archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Remove get_buffer alias of resolve_buffer_id

Browse Source
This commit is contained in:
Andy Leiserson 2025-10-23 14:45:01 -07:00 committed by Teodor Tanasoaia
parent 5ac2ed19cb
commit c6dc8eeac5
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
player/src/lib.rs
View File

@ -434,20 +434,13 @@ impl Player {
} }
} }
fn resolve_buffer_id( pub fn resolve_buffer_id(
&self, &self,
id: wgc::id::PointerId<wgc::id::markers::Buffer>, id: wgc::id::PointerId<wgc::id::markers::Buffer>,
) -> Arc<wgc::resource::Buffer> { ) -> Arc<wgc::resource::Buffer> {
self.buffers.get(&id).expect("invalid buffer").clone() self.buffers.get(&id).expect("invalid buffer").clone()
} }
pub fn get_buffer(
&self,
id: wgc::id::PointerId<wgc::id::markers::Buffer>,
) -> Arc<wgc::resource::Buffer> {
self.resolve_buffer_id(id)
}
fn resolve_texture_id( fn resolve_texture_id(
&self, &self,
id: wgc::id::PointerId<wgc::id::markers::Texture>, id: wgc::id::PointerId<wgc::id::markers::Texture>,

15
player/tests/player/main.rs
View File

@ -103,7 +103,7 @@ impl Test<'_> {
println!("\t\t\tMapping..."); println!("\t\t\tMapping...");
for expect in &self.expectations { for expect in &self.expectations {
player player
.get_buffer(expect.buffer) .resolve_buffer_id(expect.buffer)
.map_async( .map_async(
expect.offset, expect.offset,
Some(expect.data.len() as u64), Some(expect.data.len() as u64),
@ -116,16 +116,17 @@ impl Test<'_> {
} }
println!("\t\t\tWaiting..."); println!("\t\t\tWaiting...");
device.poll(wgt::PollType::Wait { device
submission_index: None, .poll(wgt::PollType::Wait {
timeout: Some(std::time::Duration::from_secs(1)), // Tests really shouldn't need longer than that! submission_index: None,
}) timeout: Some(std::time::Duration::from_secs(1)), // Tests really shouldn't need longer than that!
.unwrap(); })
.unwrap();
for expect in self.expectations { for expect in self.expectations {
println!("\t\t\tChecking {}", expect.name); println!("\t\t\tChecking {}", expect.name);
let (ptr, size) = player let (ptr, size) = player
.get_buffer(expect.buffer) .resolve_buffer_id(expect.buffer)
.get_mapped_range(expect.offset, Some(expect.data.len() as wgt::BufferAddress)) .get_mapped_range(expect.offset, Some(expect.data.len() as wgt::BufferAddress))
.unwrap(); .unwrap();
let contents = unsafe { slice::from_raw_parts(ptr.as_ptr(), size as usize) }; let contents = unsafe { slice::from_raw_parts(ptr.as_ptr(), size as usize) };