wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-21 03:39:16 +03:00
Code Issues Projects Releases Wiki Activity

put WebGpuState into an Rc

Browse Source 
So that we can pass it to RenderState
This commit is contained in:
Wez Furlong 2022-11-17 08:43:41 -07:00
parent 334fb8a2ed
commit 19385d3355
No known key found for this signature in database
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wezterm-gui/src/termwindow/mod.rs
View File

@ -439,7 +439,7 @@ pub struct TermWindow {
pub fps: f32,
gl: Option<Rc<glium::backend::Context>>,
webgpu: Option<WebGpuState>,
webgpu: Option<Rc<WebGpuState>>,
config_subscription: Option<config::ConfigSubscription>,
}
@ -818,7 +818,9 @@ impl TermWindow {
{
let mut myself = tw.borrow_mut();
let webgpu = match config.front_end {
FrontEndSelection::WebGpu => Some(WebGpuState::new(&window, dimensions).await?),
FrontEndSelection::WebGpu => {
Some(Rc::new(WebGpuState::new(&window, dimensions).await?))
}
_ => None,
};
myself.config_subscription.replace(config_subscription);

22
wezterm-gui/src/termwindow/webgpu.rs
View File

@ -1,4 +1,5 @@
use anyhow::anyhow;
use std::cell::RefCell;
use std::num::NonZeroU32;
use std::sync::Arc;
use wgpu::util::DeviceExt;
@ -47,8 +48,8 @@ pub struct WebGpuState {
pub surface: wgpu::Surface,
pub device: wgpu::Device,
pub queue: Arc<wgpu::Queue>,
pub config: wgpu::SurfaceConfiguration,
pub dimensions: Dimensions,
pub config: RefCell<wgpu::SurfaceConfiguration>,
pub dimensions: RefCell<Dimensions>,
pub render_pipeline: wgpu::RenderPipeline,
pub vertex_buffer: wgpu::Buffer,
pub num_vertices: u32,
@ -259,8 +260,8 @@ impl WebGpuState {
surface,
device,
queue,
config,
dimensions,
config: RefCell::new(config),
dimensions: RefCell::new(dimensions),
render_pipeline,
vertex_buffer,
num_vertices: VERTICES.len() as u32,
@ -269,7 +270,7 @@ impl WebGpuState {
}
#[allow(unused_mut)]
pub fn resize(&mut self, mut dims: Dimensions) {
pub fn resize(&self, mut dims: Dimensions) {
// During a live resize on Windows, the Dimensions that we're processing may be
// lagging behind the true client size. We have to take the very latest value
// from the window or else the underlying driver will raise an error about
@ -285,12 +286,13 @@ impl WebGpuState {
_ => {}
}
if dims == self.dimensions {
if dims == *self.dimensions.borrow() {
return;
}
self.dimensions = dims;
self.config.width = dims.pixel_width as u32;
self.config.height = dims.pixel_height as u32;
self.surface.configure(&self.device, &self.config);
*self.dimensions.borrow_mut() = dims;
let mut config = self.config.borrow_mut();
config.width = dims.pixel_width as u32;
config.height = dims.pixel_height as u32;
self.surface.configure(&self.device, &config);
}
}