me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1081 from PolyMeilex/wgpu-0.11

Browse source 
Update wgpu to 0.11
This commit is contained in:
Héctor Ramón 2021-10-14 14:31:41 +07:00 • committed by GitHub
commit 378a13555d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/integration_wgpu/src/main.rs
View file

@ -39,6 +39,7 @@ pub fn main() {
.request_adapter(&wgpu::RequestAdapterOptions { .request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::HighPerformance, power_preference: wgpu::PowerPreference::HighPerformance,
compatible_surface: Some(&surface), compatible_surface: Some(&surface),
force_fallback_adapter: false,
}) })
.await .await
.expect("Request adapter"); .expect("Request adapter");
@ -172,7 +173,7 @@ pub fn main() {
resized = false; resized = false;
} }
match surface.get_current_frame() { match surface.get_current_texture() {
Ok(frame) => { Ok(frame) => {
let mut encoder = device.create_command_encoder( let mut encoder = device.create_command_encoder(
&wgpu::CommandEncoderDescriptor { label: None }, &wgpu::CommandEncoderDescriptor { label: None },
@ -180,7 +181,7 @@ pub fn main() {
let program = state.program(); let program = state.program();
let view = frame.output.texture.create_view(&wgpu::TextureViewDescriptor::default()); let view = frame.texture.create_view(&wgpu::TextureViewDescriptor::default());
{ {
// We clear the frame // We clear the frame
@ -208,6 +209,7 @@ pub fn main() {
// Then we submit the work // Then we submit the work
staging_belt.finish(); staging_belt.finish();
queue.submit(Some(encoder.finish())); queue.submit(Some(encoder.finish()));
frame.present();
// Update the mouse cursor // Update the mouse cursor
window.set_cursor_icon( window.set_cursor_icon(

4
wgpu/Cargo.toml
View file

@ -27,8 +27,8 @@ default_system_font = ["iced_graphics/font-source"]
spirv = ["wgpu/spirv"] spirv = ["wgpu/spirv"]
[dependencies] [dependencies]
wgpu = "0.10" wgpu = "0.11"
wgpu_glyph = "0.14" wgpu_glyph = "0.15"
glyph_brush = "0.7" glyph_brush = "0.7"
raw-window-handle = "0.3" raw-window-handle = "0.3"
log = "0.4" log = "0.4"

5
wgpu/src/window/compositor.rs
View file

@ -40,6 +40,7 @@ impl Compositor {
wgpu::PowerPreference::HighPerformance wgpu::PowerPreference::HighPerformance
}, },
compatible_surface: compatible_surface.as_ref(), compatible_surface: compatible_surface.as_ref(),
force_fallback_adapter: false,
}) })
.await?; .await?;
@ -141,7 +142,7 @@ impl iced_graphics::window::Compositor for Compositor {
output: &<Self::Renderer as iced_native::Renderer>::Output, output: &<Self::Renderer as iced_native::Renderer>::Output,
overlay: &[T], overlay: &[T],
) -> Result<mouse::Interaction, iced_graphics::window::SurfaceError> { ) -> Result<mouse::Interaction, iced_graphics::window::SurfaceError> {
match surface.get_current_frame() { match surface.get_current_texture() {
Ok(frame) => { Ok(frame) => {
let mut encoder = self.device.create_command_encoder( let mut encoder = self.device.create_command_encoder(
&wgpu::CommandEncoderDescriptor { &wgpu::CommandEncoderDescriptor {
@ -150,7 +151,6 @@ impl iced_graphics::window::Compositor for Compositor {
); );
let view = &frame let view = &frame
.output
.texture .texture
.create_view(&wgpu::TextureViewDescriptor::default()); .create_view(&wgpu::TextureViewDescriptor::default());
@ -193,6 +193,7 @@ impl iced_graphics::window::Compositor for Compositor {
// Submit work // Submit work
self.staging_belt.finish(); self.staging_belt.finish();
self.queue.submit(Some(encoder.finish())); self.queue.submit(Some(encoder.finish()));
frame.present();
// Recall staging buffers // Recall staging buffers
self.local_pool self.local_pool