PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Revert "Reduce InstanceData footprint"

Browse source 
This reverts commit 3cdba29124.

On some systems, the target commit actually caused a massive performance
issue rather than fixing one.
This commit is contained in:
Joe Wilm 2017-07-03 19:43:44 -07:00
parent 32dfddb91d
commit 08b5ae52c1
4 changed files with 50 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cargo.lock generated
View file

@ -13,7 +13,6 @@ dependencies = [
"font 0.1.0", "font 0.1.0",
"gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.6.1 (git+https://github.com/jwilm/glutin?rev=cc64178d39a1fa06b2c5403117e5e0ef24deeac4)", "glutin 0.6.1 (git+https://github.com/jwilm/glutin?rev=cc64178d39a1fa06b2c5403117e5e0ef24deeac4)",
"half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -449,11 +448,6 @@ dependencies = [
"x11-dl 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "half"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "heapsize" name = "heapsize"
version = "0.3.9" version = "0.3.9"
@ -1297,7 +1291,6 @@ dependencies = [
"checksum gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0940975a4ca12b088d32b5d5134826c47d2e73de4b0b459b05244c01503eccbb" "checksum gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0940975a4ca12b088d32b5d5134826c47d2e73de4b0b459b05244c01503eccbb"
"checksum gleam 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "9590e0e578d528a080c5abac678e7efbe349a73c7316faafd4073edf5f462d01" "checksum gleam 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "9590e0e578d528a080c5abac678e7efbe349a73c7316faafd4073edf5f462d01"
"checksum glutin 0.6.1 (git+https://github.com/jwilm/glutin?rev=cc64178d39a1fa06b2c5403117e5e0ef24deeac4)" = "<none>" "checksum glutin 0.6.1 (git+https://github.com/jwilm/glutin?rev=cc64178d39a1fa06b2c5403117e5e0ef24deeac4)" = "<none>"
"checksum half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f"
"checksum heapsize 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "556cd479866cf85c3f671209c85e8a6990211c916d1002c2fcb2e9b7cf60bc36" "checksum heapsize 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "556cd479866cf85c3f671209c85e8a6990211c916d1002c2fcb2e9b7cf60bc36"
"checksum inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8458c07bdbdaf309c80e2c3304d14c3db64e7465d4f07cf589ccb83fd0ff31a" "checksum inotify 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8458c07bdbdaf309c80e2c3304d14c3db64e7465d4f07cf589ccb83fd0ff31a"
"checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"

1
Cargo.toml
View file

@ -33,7 +33,6 @@ clap = "2.20"
fnv = "1.0.5" fnv = "1.0.5"
unicode-width = "0.1.4" unicode-width = "0.1.4"
arraydeque = "0.2" arraydeque = "0.2"
half = "1.0"
clippy = { version = "0.0.104", optional = true } clippy = { version = "0.0.104", optional = true }
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]

1
src/lib.rs
View file

@ -38,7 +38,6 @@ extern crate errno;
extern crate fnv; extern crate fnv;
extern crate font; extern crate font;
extern crate glutin; extern crate glutin;
extern crate half;
extern crate libc; extern crate libc;
extern crate mio; extern crate mio;
extern crate notify; extern crate notify;

115
src/renderer/mod.rs
View file

@ -27,7 +27,6 @@ use gl::types::*;
use gl; use gl;
use index::{Line, Column, RangeInclusive}; use index::{Line, Column, RangeInclusive};
use notify::{Watcher as WatcherApi, RecommendedWatcher as Watcher, op}; use notify::{Watcher as WatcherApi, RecommendedWatcher as Watcher, op};
use half::f16;
use config::{self, Config, Delta}; use config::{self, Config, Delta};
use term::{self, cell, RenderableCell}; use term::{self, cell, RenderableCell};
@ -126,14 +125,14 @@ pub struct ShaderProgram {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Glyph { pub struct Glyph {
tex_id: GLuint, tex_id: GLuint,
top: i16, top: f32,
left: i16, left: f32,
width: i16, width: f32,
height: i16, height: f32,
uv_bot: f16, uv_bot: f32,
uv_left: f16, uv_left: f32,
uv_width: f16, uv_width: f32,
uv_height: f16, uv_height: f32,
} }
/// Naïve glyph cache /// Naïve glyph cache
@ -282,33 +281,29 @@ impl GlyphCache {
#[derive(Debug)] #[derive(Debug)]
#[repr(C)] #[repr(C)]
struct InstanceData { struct InstanceData {
// Grid coordinates of the cell // coords
// col: f32,
// By storing these as u16, it puts a limit on the max dimensions of the row: f32,
// terminal to u16 max value. Practically speaking, this shouldn't be a
// problem.
col: u16,
row: u16,
// glyph offset // glyph offset
left: i16, left: f32,
top: i16, top: f32,
// glyph scale // glyph scale
width: i16, width: f32,
height: i16, height: f32,
// uv offset // uv offset
uv_left: f16, uv_left: f32,
uv_bot: f16, uv_bot: f32,
// uv scale // uv scale
uv_width: f16, uv_width: f32,
uv_height: f16, uv_height: f32,
// color // color
r: u8, r: f32,
g: u8, g: f32,
b: u8, b: f32,
// background color // background color
bg_r: u8, bg_r: f32,
bg_g: u8, bg_g: f32,
bg_b: u8, bg_b: f32,
} }
#[derive(Debug)] #[derive(Debug)]
@ -371,8 +366,8 @@ impl Batch {
} }
self.instances.push(InstanceData { self.instances.push(InstanceData {
col: cell.column.0 as u16, col: cell.column.0 as f32,
row: cell.line.0 as u16, row: cell.line.0 as f32,
top: glyph.top, top: glyph.top,
left: glyph.left, left: glyph.left,
@ -384,13 +379,13 @@ impl Batch {
uv_width: glyph.uv_width, uv_width: glyph.uv_width,
uv_height: glyph.uv_height, uv_height: glyph.uv_height,
r: cell.fg.r, r: cell.fg.r as f32,
g: cell.fg.g, g: cell.fg.g as f32,
b: cell.fg.b, b: cell.fg.b as f32,
bg_r: cell.bg.r, bg_r: cell.bg.r as f32,
bg_g: cell.bg.g, bg_g: cell.bg.g as f32,
bg_b: cell.bg.b, bg_b: cell.bg.b as f32,
}); });
} }
@ -495,48 +490,38 @@ impl QuadRenderer {
(BATCH_MAX * size_of::<InstanceData>()) as isize, (BATCH_MAX * size_of::<InstanceData>()) as isize,
ptr::null(), gl::STREAM_DRAW); ptr::null(), gl::STREAM_DRAW);
// coords // coords
let mut size = 0;
gl::VertexAttribPointer(1, 2, gl::VertexAttribPointer(1, 2,
gl::UNSIGNED_SHORT, gl::FALSE, gl::FLOAT, gl::FALSE,
size_of::<InstanceData>() as i32, size_of::<InstanceData>() as i32,
ptr::null()); ptr::null());
gl::EnableVertexAttribArray(1); gl::EnableVertexAttribArray(1);
gl::VertexAttribDivisor(1, 1); gl::VertexAttribDivisor(1, 1);
size += 2 * size_of::<u16>();
// glyphoffset // glyphoffset
gl::VertexAttribPointer(2, 4, gl::VertexAttribPointer(2, 4,
gl::SHORT, gl::FALSE, gl::FLOAT, gl::FALSE,
size_of::<InstanceData>() as i32, size_of::<InstanceData>() as i32,
size as *const _); (2 * size_of::<f32>()) as *const _);
gl::EnableVertexAttribArray(2); gl::EnableVertexAttribArray(2);
gl::VertexAttribDivisor(2, 1); gl::VertexAttribDivisor(2, 1);
size += 4 * size_of::<i16>();
// uv // uv
gl::VertexAttribPointer(3, 4, gl::VertexAttribPointer(3, 4,
gl::HALF_FLOAT, gl::FALSE, gl::FLOAT, gl::FALSE,
size_of::<InstanceData>() as i32, size_of::<InstanceData>() as i32,
size as *const _); (6 * size_of::<f32>()) as *const _);
gl::EnableVertexAttribArray(3); gl::EnableVertexAttribArray(3);
gl::VertexAttribDivisor(3, 1); gl::VertexAttribDivisor(3, 1);
size += 4 * size_of::<f16>();
// color // color
gl::VertexAttribPointer(4, 3, gl::VertexAttribPointer(4, 3,
gl::UNSIGNED_BYTE, gl::FALSE, gl::FLOAT, gl::FALSE,
size_of::<InstanceData>() as i32, size_of::<InstanceData>() as i32,
size as *const _); (10 * size_of::<f32>()) as *const _);
gl::EnableVertexAttribArray(4); gl::EnableVertexAttribArray(4);
gl::VertexAttribDivisor(4, 1); gl::VertexAttribDivisor(4, 1);
size += 3 * size_of::<u8>();
// color // color
gl::VertexAttribPointer(5, 3, gl::VertexAttribPointer(5, 3,
gl::UNSIGNED_BYTE, gl::FALSE, gl::FLOAT, gl::FALSE,
size_of::<InstanceData>() as i32, size_of::<InstanceData>() as i32,
size as *const _); (13 * size_of::<f32>()) as *const _);
gl::EnableVertexAttribArray(5); gl::EnableVertexAttribArray(5);
gl::VertexAttribDivisor(5, 1); gl::VertexAttribDivisor(5, 1);
@ -1334,14 +1319,14 @@ impl Atlas {
Glyph { Glyph {
tex_id: self.id, tex_id: self.id,
top: glyph.top as i16, top: glyph.top as f32,
width: width as i16, width: width as f32,
height: height as i16, height: height as f32,
left: glyph.left as i16, left: glyph.left as f32,
uv_bot: f16::from_f32(uv_bot), uv_bot: uv_bot,
uv_left: f16::from_f32(uv_left), uv_left: uv_left,
uv_width: f16::from_f32(uv_width), uv_width: uv_width,
uv_height: f16::from_f32(uv_height), uv_height: uv_height,
} }
} }