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

renderer: keep post uniform buffer in frame state

Browse Source 
This avoids creating a new buffer for this every frame.
This commit is contained in:
Qwerasd
2025-06-23 16:30:07 -06:00
parent 1da40ccbac
commit 706a43138e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/renderer/generic.zig
View File

@@ -301,7 +301,6 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
/// Custom shader state, this is null if we have no custom shaders. /// Custom shader state, this is null if we have no custom shaders.
custom_shader_state: ?CustomShaderState = null, custom_shader_state: ?CustomShaderState = null,
/// A buffer containing the uniform data.
const UniformBuffer = Buffer(shaderpkg.Uniforms); const UniformBuffer = Buffer(shaderpkg.Uniforms);
const CellBgBuffer = Buffer(shaderpkg.CellBg); const CellBgBuffer = Buffer(shaderpkg.CellBg);
const CellTextBuffer = Buffer(shaderpkg.CellText); const CellTextBuffer = Buffer(shaderpkg.CellText);
@@ -395,12 +394,20 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
front_texture: Texture, front_texture: Texture,
back_texture: Texture, back_texture: Texture,
uniforms: UniformBuffer,
const UniformBuffer = Buffer(shadertoy.Uniforms);
/// Swap the front and back textures. /// Swap the front and back textures.
pub fn swap(self: *CustomShaderState) void { pub fn swap(self: *CustomShaderState) void {
std.mem.swap(Texture, &self.front_texture, &self.back_texture); std.mem.swap(Texture, &self.front_texture, &self.back_texture);
} }
pub fn init(api: GraphicsAPI) !CustomShaderState { pub fn init(api: GraphicsAPI) !CustomShaderState {
// Create a GPU buffer to hold our uniforms.
var uniforms = try UniformBuffer.init(api.uniformBufferOptions(), 1);
errdefer uniforms.deinit();
// Initialize the front and back textures at 1x1 px, this // Initialize the front and back textures at 1x1 px, this
// is slightly wasteful but it's only done once so whatever. // is slightly wasteful but it's only done once so whatever.
const front_texture = try Texture.init( const front_texture = try Texture.init(
@@ -417,15 +424,18 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
null, null,
); );
errdefer back_texture.deinit(); errdefer back_texture.deinit();
return .{ return .{
.front_texture = front_texture, .front_texture = front_texture,
.back_texture = back_texture, .back_texture = back_texture,
.uniforms = uniforms,
}; };
} }
pub fn deinit(self: *CustomShaderState) void { pub fn deinit(self: *CustomShaderState) void {
self.front_texture.deinit(); self.front_texture.deinit();
self.back_texture.deinit(); self.back_texture.deinit();
self.uniforms.deinit();
} }
pub fn resize( pub fn resize(
@@ -1453,14 +1463,8 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
// If we have custom shaders, then we render them. // If we have custom shaders, then we render them.
if (frame.custom_shader_state) |*state| { if (frame.custom_shader_state) |*state| {
// We create a buffer on the GPU for our post uniforms. // Sync our uniforms.
// TODO: This should be a part of the frame state tbqh. try state.uniforms.sync(&.{self.custom_shader_uniforms});
const PostBuffer = Buffer(shadertoy.Uniforms);
const uniform_buffer = try PostBuffer.initFill(
self.api.bufferOptions(),
&.{self.custom_shader_uniforms},
);
defer uniform_buffer.deinit();
for (self.shaders.post_pipelines, 0..) |pipeline, i| { for (self.shaders.post_pipelines, 0..) |pipeline, i| {
defer state.swap(); defer state.swap();
@@ -1476,7 +1480,7 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
pass.step(.{ pass.step(.{
.pipeline = pipeline, .pipeline = pipeline,
.uniforms = uniform_buffer.buffer, .uniforms = state.uniforms.buffer,
.textures = &.{state.back_texture}, .textures = &.{state.back_texture},
.draw = .{ .draw = .{
.type = .triangle, .type = .triangle,