Skip to content

Upgrade wgpu to 26 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hecrj merged 1 commit into from
Aug 19, 2025
Merged

Upgrade wgpu to 26 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ documentation = "https://docs.rs/wgpu_glyph"
readme = "README.md"

[dependencies]
wgpu = "23"
wgpu = "26"
glyph_brush = "0.7"
log = "0.4"

Expand Down
259 changes: 131 additions & 128 deletions examples/clipping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fn main() -> Result<(), Box<dyn Error>> {
.build(&event_loop)
.unwrap();

let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::default());
let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default());
let surface = instance.create_surface(&window)?;

// Initialize GPU
Expand All @@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn Error>> {
.expect("Request adapter");

adapter
.request_device(&wgpu::DeviceDescriptor::default(), None)
.request_device(&wgpu::DeviceDescriptor::default())
.await
.expect("Request device")
});
Expand Down Expand Up @@ -65,137 +65,140 @@ fn main() -> Result<(), Box<dyn Error>> {
// Render loop
window.request_redraw();

event_loop.run(move |event, elwt| {
match event {
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::CloseRequested,
..
} => elwt.exit(),
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::Resized(new_size),
..
} => {
size = new_size;

surface.configure(
&device,
&wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format: render_format,
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto,
view_formats: vec![],
desired_maximum_frame_latency: 2,
},
);
}
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::RedrawRequested,
..
} => {
// Get a command encoder for the current frame
let mut encoder = device.create_command_encoder(
&wgpu::CommandEncoderDescriptor {
label: Some("Redraw"),
},
);

// Get the next frame
let frame =
surface.get_current_texture().expect("Get next frame");
let view = &frame
.texture
.create_view(&wgpu::TextureViewDescriptor::default());

// Clear frame
{
let _ = encoder.begin_render_pass(
&wgpu::RenderPassDescriptor {
label: Some("Render pass"),
color_attachments: &[Some(
wgpu::RenderPassColorAttachment {
view,
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(
wgpu::Color {
r: 0.4,
g: 0.4,
b: 0.4,
a: 1.0,
},
),
store: wgpu::StoreOp::Store,
},
},
)],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
event_loop
.run(move |event, elwt| {
match event {
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::CloseRequested,
..
} => elwt.exit(),
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::Resized(new_size),
..
} => {
size = new_size;

surface.configure(
&device,
&wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format: render_format,
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto,
view_formats: vec![],
desired_maximum_frame_latency: 2,
},
);
}
winit::event::Event::WindowEvent {
event: winit::event::WindowEvent::RedrawRequested,
..
} => {
// Get a command encoder for the current frame
let mut encoder = device.create_command_encoder(
&wgpu::CommandEncoderDescriptor {
label: Some("Redraw"),
},
);

glyph_brush.queue(Section {
screen_position: (30.0, 30.0),
bounds: (size.width as f32, size.height as f32),
text: vec![Text::new("Hello wgpu_glyph!")
.with_color([0.0, 0.0, 0.0, 1.0])
.with_scale(40.0)],
..Section::default()
});

// Draw the text!
glyph_brush
.draw_queued(
&device,
&mut staging_belt,
&mut encoder,
view,
size.width,
size.height,
)
.expect("Draw queued");

glyph_brush.queue(Section {
screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32),
text: vec![Text::new("Hello wgpu_glyph!")
.with_color([1.0, 1.0, 1.0, 1.0])
.with_scale(40.0)],
..Section::default()
});

// Draw the text!
glyph_brush
.draw_queued_with_transform_and_scissoring(
&device,
&mut staging_belt,
&mut encoder,
view,
wgpu_glyph::orthographic_projection(
// Get the next frame
let frame =
surface.get_current_texture().expect("Get next frame");
let view = &frame
.texture
.create_view(&wgpu::TextureViewDescriptor::default());

// Clear frame
{
let _ = encoder.begin_render_pass(
&wgpu::RenderPassDescriptor {
label: Some("Render pass"),
color_attachments: &[Some(
wgpu::RenderPassColorAttachment {
view,
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(
wgpu::Color {
r: 0.4,
g: 0.4,
b: 0.4,
a: 1.0,
},
),
store: wgpu::StoreOp::Store,
},
depth_slice: None,
},
)],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
},
);
}

glyph_brush.queue(Section {
screen_position: (30.0, 30.0),
bounds: (size.width as f32, size.height as f32),
text: vec![Text::new("Hello wgpu_glyph!")
.with_color([0.0, 0.0, 0.0, 1.0])
.with_scale(40.0)],
..Section::default()
});

// Draw the text!
glyph_brush
.draw_queued(
&device,
&mut staging_belt,
&mut encoder,
view,
size.width,
size.height,
),
Region {
x: 40,
y: 105,
width: 200,
height: 15,
},
)
.expect("Draw queued");

// Submit the work!
staging_belt.finish();
queue.submit(Some(encoder.finish()));
frame.present();
// Recall unused staging buffers
staging_belt.recall();
)
.expect("Draw queued");

glyph_brush.queue(Section {
screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32),
text: vec![Text::new("Hello wgpu_glyph!")
.with_color([1.0, 1.0, 1.0, 1.0])
.with_scale(40.0)],
..Section::default()
});

// Draw the text!
glyph_brush
.draw_queued_with_transform_and_scissoring(
&device,
&mut staging_belt,
&mut encoder,
view,
wgpu_glyph::orthographic_projection(
size.width,
size.height,
),
Region {
x: 40,
y: 105,
width: 200,
height: 15,
},
)
.expect("Draw queued");

// Submit the work!
staging_belt.finish();
queue.submit(Some(encoder.finish()));
frame.present();
// Recall unused staging buffers
staging_belt.recall();
}
_ => {}
}
_ => {}
}
}).map_err(Into::into)
})
.map_err(Into::into)
}
Loading
Loading