diff --git a/src/renderer/Metal.zig b/src/renderer/Metal.zig index 6c7432d21..ff0f83773 100644 --- a/src/renderer/Metal.zig +++ b/src/renderer/Metal.zig @@ -275,7 +275,6 @@ pub inline fn bufferOptions(self: Metal) bufferpkg.Options { }; } -pub const instanceBufferOptions = bufferOptions; pub const uniformBufferOptions = bufferOptions; pub const fgBufferOptions = bufferOptions; pub const bgBufferOptions = bufferOptions; diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig index 4b01da0c5..48b715703 100644 --- a/src/renderer/OpenGL.zig +++ b/src/renderer/OpenGL.zig @@ -344,7 +344,6 @@ pub inline fn bufferOptions(self: OpenGL) bufferpkg.Options { }; } -pub const instanceBufferOptions = bufferOptions; pub const uniformBufferOptions = bufferOptions; pub const fgBufferOptions = bufferOptions; pub const bgBufferOptions = bufferOptions; diff --git a/src/renderer/opengl/Pipeline.zig b/src/renderer/opengl/Pipeline.zig index b3009b641..a9f722263 100644 --- a/src/renderer/opengl/Pipeline.zig +++ b/src/renderer/opengl/Pipeline.zig @@ -20,7 +20,7 @@ pub const Options = struct { /// Whether to enable blending. blending_enabled: bool = true, - /// Optional texture buffer binding for `buffers[1]`. + /// Texture buffer binding for `buffers[1]`. buffer_texture: ?BufferTexture = null, pub const BufferTexture = struct { diff --git a/src/renderer/opengl/RenderPass.zig b/src/renderer/opengl/RenderPass.zig index 9a047e589..063bceddf 100644 --- a/src/renderer/opengl/RenderPass.zig +++ b/src/renderer/opengl/RenderPass.zig @@ -104,13 +104,7 @@ pub fn step(self: *Self, s: Step) void { if (s.pipeline.buffer_texture) |tbo| { gl.Texture.active(tbo.unit) catch return; const tbind = tbo.texture.bind(.Buffer) catch return; - - if (s.buffers.len > 1 and s.buffers[1] != null) { - tbind.buffer(tbo.internal_format, s.buffers[1].?.id) catch return; - } else { - // Detach to avoid stale bindings from prior draws. - tbind.buffer(tbo.internal_format, 0) catch return; - } + tbind.buffer(tbo.internal_format, s.buffers[1].?.id) catch return; } // Bind relevant samplers. diff --git a/src/renderer/opengl/shaders.zig b/src/renderer/opengl/shaders.zig index 4c8ecf094..da58e1e79 100644 --- a/src/renderer/opengl/shaders.zig +++ b/src/renderer/opengl/shaders.zig @@ -91,7 +91,7 @@ const PipelineCollection = t: { } }); }; -/// This contains the state for the shaders used by the Metal renderer. +/// This contains the state for the shaders used by the OpenGL renderer. pub const Shaders = struct { /// Collection of available render pipelines. pipelines: PipelineCollection,