mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-06 18:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

add background pass

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-04-19 08:54:39 -07:00
parent e9661fa55e
commit c43c1d38f1
4 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Grid.zig
View File

@@ -52,6 +52,12 @@ const GPUCell = struct {
glyph_offset_x: i32,
glyph_offset_y: i32,
/// vec4 fg_color_in
fg_r: u8,
fg_g: u8,
fg_b: u8,
fg_a: u8,
/// vec4 bg_color_in
bg_r: u8,
bg_g: u8,
@@ -140,16 +146,20 @@ pub fn init(alloc: Allocator) !Grid {
try vbobind.attributeAdvanced(3, 2, gl.c.GL_INT, false, @sizeOf(GPUCell), offset);
offset += 2 * @sizeOf(i32);
try vbobind.attributeAdvanced(4, 4, gl.c.GL_UNSIGNED_BYTE, false, @sizeOf(GPUCell), offset);
offset += 4 * @sizeOf(u8);
try vbobind.attributeAdvanced(5, 4, gl.c.GL_UNSIGNED_BYTE, false, @sizeOf(GPUCell), offset);
try vbobind.enableAttribArray(0);
try vbobind.enableAttribArray(1);
try vbobind.enableAttribArray(2);
try vbobind.enableAttribArray(3);
try vbobind.enableAttribArray(4);
try vbobind.enableAttribArray(5);
try vbobind.attributeDivisor(0, 1);
try vbobind.attributeDivisor(1, 1);
try vbobind.attributeDivisor(2, 1);
try vbobind.attributeDivisor(3, 1);
try vbobind.attributeDivisor(4, 1);
try vbobind.attributeDivisor(5, 1);
// Build our texture
const tex = try gl.Texture.create();
@@ -246,10 +256,14 @@ pub fn updateCells(self: *Grid, term: Terminal) !void {
.glyph_height = glyph.height,
.glyph_offset_x = glyph.offset_x,
.glyph_offset_y = glyph.offset_y,
.bg_r = 0xFF,
.fg_r = 0xFF,
.fg_g = 0xA5,
.fg_b = 0,
.fg_a = 255,
.bg_r = 0x0,
.bg_g = 0xA5,
.bg_b = 0,
.bg_a = 255,
.bg_a = 0,
});
}
}
@@ -304,6 +318,15 @@ pub fn render(self: Grid) !void {
var texbind = try self.texture.bind(.@"2D");
defer texbind.unbind();
try self.program.setUniform("background", 1);
try gl.drawElementsInstanced(
gl.c.GL_TRIANGLES,
6,
gl.c.GL_UNSIGNED_BYTE,
self.cells.items.len,
);
try self.program.setUniform("background", 0);
try gl.drawElementsInstanced(
gl.c.GL_TRIANGLES,
6,

1
src/opengl/Program.zig
View File

@@ -82,6 +82,7 @@ pub inline fn setUniform(p: Program, n: [:0]const u8, value: anytype) !void {
// Perform the correct call depending on the type of the value.
switch (@TypeOf(value)) {
comptime_int => c.glUniform1i(loc, value),
@Vector(2, f32) => c.glUniform2f(loc, value[0], value[1]),
@Vector(3, f32) => c.glUniform3f(loc, value[0], value[1], value[2]),
@Vector(4, f32) => c.glUniform4f(loc, value[0], value[1], value[2], value[3]),