Skip to content

Commit

Permalink
Update vger
Browse files Browse the repository at this point in the history
  • Loading branch information
wtholliday committed May 31, 2023
1 parent 5761c2f commit 63190cc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ default = [ "winit" ]

[dependencies]
euclid = "0.22.7"
wgpu = "0.15.1"
wgpu = "0.16.0"
futures = "0.3"
vger = "0.2.5"
vger = "0.2.7"
accesskit = "0.10.0"
lazy_static = "1.4.0"
winit = { version = "0.28.1", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ impl Context {
depth_stencil_attachment: None,
};

vger.encode(device, &desc, render_info.queue);
vger.encode(&desc);

frame.present();
}
Expand Down
8 changes: 4 additions & 4 deletions src/winit_event_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::*;
use futures::executor::block_on;
use std::{
collections::{HashMap, VecDeque},
sync::Mutex,
sync::{Arc, Mutex},
};

use winit::{
Expand Down Expand Up @@ -146,10 +146,10 @@ pub fn rui(view: impl View) {

let setup = block_on(setup(&window));
let surface = setup.surface;
let device = setup.device;
let device = Arc::new(setup.device);
let size = setup.size;
let adapter = setup.adapter;
let queue = setup.queue;
let queue = Arc::new(setup.queue);

let mut config = wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
Expand All @@ -167,7 +167,7 @@ pub fn rui(view: impl View) {
*GLOBAL_EVENT_LOOP_PROXY.lock().unwrap() = Some(event_loop.create_proxy());
}

let mut vger = Vger::new(&device, config.format);
let mut vger = Vger::new(device.clone(), queue.clone(), config.format);
let mut cx = Context::new();
let mut mouse_position = LocalPoint::zero();

Expand Down

0 comments on commit 63190cc

Please sign in to comment.