paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: handle null GBA ROM titles when passing to imgui

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-03-04 18:02:12 -06:00
parent d985eac0fc
commit 72b702cb21
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/imgui.zig
View File

@ -33,9 +33,10 @@ pub const State = struct {
pub fn init(allocator: Allocator, title: [12]u8) !@This() { pub fn init(allocator: Allocator, title: [12]u8) !@This() {
const history = try allocator.alloc(u32, histogram_len); const history = try allocator.alloc(u32, histogram_len);
const without_null = std.mem.sliceTo(&title, 0);
return .{ return .{
.title = try allocator.dupeZ(u8, &title), .title = try allocator.dupeZ(u8, without_null),
.fps_hist = RingBuffer(u32).init(history), .fps_hist = RingBuffer(u32).init(history),
}; };
} }
@ -87,7 +88,8 @@ pub fn draw(state: *State, tex_id: GLuint, cpu: *Arm7tdmi) void {
const w = @intToFloat(f32, gba_width * win_scale); const w = @intToFloat(f32, gba_width * win_scale);
const h = @intToFloat(f32, gba_height * win_scale); const h = @intToFloat(f32, gba_height * win_scale);
_ = zgui.begin(state.title, .{ .flags = .{ .no_resize = true, .always_auto_resize = true } }); const window_title = if (state.title.len != 0) state.title else "[No Title]";
_ = zgui.begin(window_title, .{ .flags = .{ .no_resize = true, .always_auto_resize = true } });
defer zgui.end(); defer zgui.end();
zgui.image(@intToPtr(*anyopaque, tex_id), .{ .w = w, .h = h, .uv0 = .{ 0, 1 }, .uv1 = .{ 1, 0 } }); zgui.image(@intToPtr(*anyopaque, tex_id), .{ .w = w, .h = h, .uv0 = .{ 0, 1 }, .uv1 = .{ 1, 0 } });

2
src/platform.zig
View File

@ -182,7 +182,7 @@ pub const Gui = struct {
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, @sizeOf(@TypeOf(indices)), &indices, gl.STATIC_DRAW); gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, @sizeOf(@TypeOf(indices)), &indices, gl.STATIC_DRAW);
// Position // Position
gl.vertexAttribPointer(0, 3, gl.FLOAT, gl.FALSE, 8 * @sizeOf(f32), @intToPtr(?*anyopaque, 0)); // lmao gl.vertexAttribPointer(0, 3, gl.FLOAT, gl.FALSE, 8 * @sizeOf(f32), null); // lmao
gl.enableVertexAttribArray(0); gl.enableVertexAttribArray(0);
// Colour // Colour
gl.vertexAttribPointer(1, 3, gl.FLOAT, gl.FALSE, 8 * @sizeOf(f32), @intToPtr(?*anyopaque, (3 * @sizeOf(f32)))); gl.vertexAttribPointer(1, 3, gl.FLOAT, gl.FALSE, 8 * @sizeOf(f32), @intToPtr(?*anyopaque, (3 * @sizeOf(f32))));