wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-27 12:23:46 +03:00
Code Issues Projects Releases Wiki Activity

wezterm: retry initial texture allocation

Browse Source 
A consequence of reducing the initial texture size is that for
larger starting font sizes it isn't big enough.  We need to make
a couple of passes to determine the required size, so that's
what this commit does.

refs: #307
This commit is contained in:
Wez Furlong 2020-10-25 16:09:47 -07:00
parent 114c67d338
commit 42aeb6f11b
1 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
wezterm-gui/src/gui/renderstate.rs
View File

@ -1,6 +1,7 @@
use super::glyphcache::GlyphCache; use super::glyphcache::GlyphCache;
use super::quad::*; use super::quad::*;
use super::utilsprites::{RenderMetrics, UtilSprites}; use super::utilsprites::{RenderMetrics, UtilSprites};
use ::window::bitmaps::atlas::OutOfTextureSpace;
use ::window::glium::backend::Context as GliumContext; use ::window::glium::backend::Context as GliumContext;
use ::window::glium::texture::SrgbTexture2d; use ::window::glium::texture::SrgbTexture2d;
use ::window::glium::{IndexBuffer, VertexBuffer}; use ::window::glium::{IndexBuffer, VertexBuffer};
@ -34,51 +35,67 @@ impl OpenGLRenderState {
context: Rc<GliumContext>, context: Rc<GliumContext>,
fonts: &Rc<FontConfiguration>, fonts: &Rc<FontConfiguration>,
metrics: &RenderMetrics, metrics: &RenderMetrics,
size: usize, mut atlas_size: usize,
pixel_width: usize, pixel_width: usize,
pixel_height: usize, pixel_height: usize,
) -> anyhow::Result<Self> { ) -> anyhow::Result<Self> {
let glyph_cache = RefCell::new(GlyphCache::new_gl(&context, fonts, size)?); loop {
let util_sprites = UtilSprites::new(&mut *glyph_cache.borrow_mut(), metrics)?; let glyph_cache = RefCell::new(GlyphCache::new_gl(&context, fonts, atlas_size)?);
let result = UtilSprites::new(&mut *glyph_cache.borrow_mut(), metrics);
match result {
Ok(util_sprites) => {
let mut errors = vec![];
let mut program = None;
for version in &["330", "300 es"] {
let source = glium::program::ProgramCreationInput::SourceCode {
vertex_shader: &Self::vertex_shader(version),
fragment_shader: &Self::fragment_shader(version),
outputs_srgb: true,
tessellation_control_shader: None,
tessellation_evaluation_shader: None,
transform_feedback_varyings: None,
uses_point_size: false,
geometry_shader: None,
};
log::info!("compiling a prog with version {}", version);
match glium::Program::new(&context, source) {
Ok(prog) => {
program = Some(prog);
break;
}
Err(err) => errors.push(err.to_string()),
};
}
let mut errors = vec![]; let program = program.ok_or_else(|| {
let mut program = None; anyhow!("Failed to compile shaders: {}", errors.join("\n"))
for version in &["330", "300 es"] { })?;
let source = glium::program::ProgramCreationInput::SourceCode {
vertex_shader: &Self::vertex_shader(version), let (glyph_vertex_buffer, glyph_index_buffer, quads) = Self::compute_vertices(
fragment_shader: &Self::fragment_shader(version), &context,
outputs_srgb: true, metrics,
tessellation_control_shader: None, pixel_width as f32,
tessellation_evaluation_shader: None, pixel_height as f32,
transform_feedback_varyings: None, )?;
uses_point_size: false,
geometry_shader: None, return Ok(Self {
}; context,
log::info!("compiling a prog with version {}", version); glyph_cache,
match glium::Program::new(&context, source) { util_sprites,
Ok(prog) => { program,
program = Some(prog); glyph_vertex_buffer: RefCell::new(glyph_vertex_buffer),
break; glyph_index_buffer,
quads,
});
}
Err(OutOfTextureSpace { size: Some(size) }) => {
atlas_size = size;
}
Err(OutOfTextureSpace { size: None }) => {
anyhow::bail!("requested texture size is impossible!?")
} }
Err(err) => errors.push(err.to_string()),
}; };
} }
let program =
program.ok_or_else(|| anyhow!("Failed to compile shaders: {}", errors.join("\n")))?;
let (glyph_vertex_buffer, glyph_index_buffer, quads) =
Self::compute_vertices(&context, metrics, pixel_width as f32, pixel_height as f32)?;
Ok(Self {
context,
glyph_cache,
util_sprites,
program,
glyph_vertex_buffer: RefCell::new(glyph_vertex_buffer),
glyph_index_buffer,
quads,
})
} }
pub fn advise_of_window_size_change( pub fn advise_of_window_size_change(