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

wezterm: reduce initial texture atlas size

Browse Source 
Reduce the initial atlas size from 4096*4096*4 to
128*128*4.

Fixup an issue with rendering image cells that would
prevent the render from propagating a texture space
error and keep wezterm busy.

refs: #306
refs: #292
This commit is contained in:
Wez Furlong 2020-10-23 09:07:51 -07:00
parent 627d21cbac
commit e665bdb139
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
wezterm/src/gui/termwindow.rs
View File

@ -57,7 +57,7 @@ use wezterm_term::color::ColorPalette;
use wezterm_term::input::LastMouseClick; use wezterm_term::input::LastMouseClick;
use wezterm_term::{CellAttributes, Line, StableRowIndex, TerminalConfiguration}; use wezterm_term::{CellAttributes, Line, StableRowIndex, TerminalConfiguration};
const ATLAS_SIZE: usize = 4096; const ATLAS_SIZE: usize = 128;
#[derive(Copy, Debug, Clone, Eq, PartialEq)] #[derive(Copy, Debug, Clone, Eq, PartialEq)]
pub enum SpawnWhere { pub enum SpawnWhere {
@ -2809,53 +2809,51 @@ impl TermWindow {
if let Some(image) = attrs.image() { if let Some(image) = attrs.image() {
// Render iTerm2 style image attributes // Render iTerm2 style image attributes
if let Ok(sprite) = gl_state let sprite = gl_state
.glyph_cache .glyph_cache
.borrow_mut() .borrow_mut()
.cached_image(image.image_data()) .cached_image(image.image_data())?;
{ let width = sprite.coords.size.width;
let width = sprite.coords.size.width; let height = sprite.coords.size.height;
let height = sprite.coords.size.height;
let top_left = image.top_left(); let top_left = image.top_left();
let bottom_right = image.bottom_right(); let bottom_right = image.bottom_right();
let origin = Point::new( let origin = Point::new(
sprite.coords.origin.x + (*top_left.x * width as f32) as isize, sprite.coords.origin.x + (*top_left.x * width as f32) as isize,
sprite.coords.origin.y + (*top_left.y * height as f32) as isize, sprite.coords.origin.y + (*top_left.y * height as f32) as isize,
); );
let coords = Rect::new( let coords = Rect::new(
origin, origin,
Size::new( Size::new(
((*bottom_right.x - *top_left.x) * width as f32) as isize, ((*bottom_right.x - *top_left.x) * width as f32) as isize,
((*bottom_right.y - *top_left.y) * height as f32) as isize, ((*bottom_right.y - *top_left.y) * height as f32) as isize,
), ),
); );
let texture_rect = sprite.texture.to_texture_coords(coords); let texture_rect = sprite.texture.to_texture_coords(coords);
let mut quad = match quads.cell(cell_idx, params.line_idx) { let mut quad = match quads.cell(cell_idx, params.line_idx) {
Ok(quad) => quad, Ok(quad) => quad,
Err(_) => break, Err(_) => break,
}; };
quad.set_hsv(hsv); quad.set_hsv(hsv);
quad.set_fg_color(glyph_color); quad.set_fg_color(glyph_color);
quad.set_bg_color(bg_color); quad.set_bg_color(bg_color);
quad.set_texture(texture_rect); quad.set_texture(texture_rect);
quad.set_texture_adjust(0., 0., 0., 0.); quad.set_texture_adjust(0., 0., 0., 0.);
quad.set_underline(gl_state.util_sprites.white_space.texture_coords()); quad.set_underline(gl_state.util_sprites.white_space.texture_coords());
quad.set_has_color(true); quad.set_has_color(true);
quad.set_cursor( quad.set_cursor(
gl_state gl_state
.util_sprites .util_sprites
.cursor_sprite(cursor_shape) .cursor_sprite(cursor_shape)
.texture_coords(), .texture_coords(),
); );
quad.set_cursor_color(params.cursor_border_color); quad.set_cursor_color(params.cursor_border_color);
continue; continue;
}
} }
let texture = glyph let texture = glyph