pkg: yeet more usingns

This commit is contained in:
Mitchell Hashimoto
2024-08-16 16:52:28 -07:00
parent 318dc85c02
commit 7a7f7da4ef
5 changed files with 25 additions and 28 deletions

View File

@ -1,24 +1,4 @@
const c = @cImport({ pub const c = @cImport({
@cDefine("CIMGUI_DEFINE_ENUMS_AND_STRUCTS", "1"); @cDefine("CIMGUI_DEFINE_ENUMS_AND_STRUCTS", "1");
@cInclude("cimgui.h"); @cInclude("cimgui.h");
}); });
// Export all of the C API
pub usingnamespace c;
// OpenGL
pub extern fn ImGui_ImplOpenGL3_Init(?[*:0]const u8) callconv(.C) bool;
pub extern fn ImGui_ImplOpenGL3_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplOpenGL3_NewFrame() callconv(.C) void;
pub extern fn ImGui_ImplOpenGL3_RenderDrawData(*c.ImDrawData) callconv(.C) void;
// Metal
pub extern fn ImGui_ImplMetal_Init(*anyopaque) callconv(.C) bool;
pub extern fn ImGui_ImplMetal_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplMetal_NewFrame(*anyopaque) callconv(.C) void;
pub extern fn ImGui_ImplMetal_RenderDrawData(*c.ImDrawData, *anyopaque, *anyopaque) callconv(.C) void;
// OSX
pub extern fn ImGui_ImplOSX_Init(*anyopaque) callconv(.C) bool;
pub extern fn ImGui_ImplOSX_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplOSX_NewFrame(*anyopaque) callconv(.C) void;

View File

@ -1,3 +1,20 @@
pub const c = @import("c.zig"); pub const c = @import("c.zig").c;
// OpenGL
pub extern fn ImGui_ImplOpenGL3_Init(?[*:0]const u8) callconv(.C) bool;
pub extern fn ImGui_ImplOpenGL3_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplOpenGL3_NewFrame() callconv(.C) void;
pub extern fn ImGui_ImplOpenGL3_RenderDrawData(*c.ImDrawData) callconv(.C) void;
// Metal
pub extern fn ImGui_ImplMetal_Init(*anyopaque) callconv(.C) bool;
pub extern fn ImGui_ImplMetal_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplMetal_NewFrame(*anyopaque) callconv(.C) void;
pub extern fn ImGui_ImplMetal_RenderDrawData(*c.ImDrawData, *anyopaque, *anyopaque) callconv(.C) void;
// OSX
pub extern fn ImGui_ImplOSX_Init(*anyopaque) callconv(.C) bool;
pub extern fn ImGui_ImplOSX_Shutdown() callconv(.C) void;
pub extern fn ImGui_ImplOSX_NewFrame(*anyopaque) callconv(.C) void;
test {} test {}

View File

@ -1,3 +1,3 @@
pub usingnamespace @cImport({ pub const c = @cImport({
@cInclude("spirv_cross_c.h"); @cInclude("spirv_cross_c.h");
}); });

View File

@ -1 +1 @@
pub const c = @import("c.zig"); pub const c = @import("c.zig").c;

View File

@ -1157,7 +1157,7 @@ pub const Inspector = struct {
pub fn deinit(self: Backend) void { pub fn deinit(self: Backend) void {
switch (self) { switch (self) {
.metal => if (builtin.target.isDarwin()) cimgui.c.ImGui_ImplMetal_Shutdown(), .metal => if (builtin.target.isDarwin()) cimgui.ImGui_ImplMetal_Shutdown(),
} }
} }
}; };
@ -1203,7 +1203,7 @@ pub const Inspector = struct {
self.backend = null; self.backend = null;
} }
if (!cimgui.c.ImGui_ImplMetal_Init(device.value)) { if (!cimgui.ImGui_ImplMetal_Init(device.value)) {
log.warn("failed to initialize metal backend", .{}); log.warn("failed to initialize metal backend", .{});
return false; return false;
} }
@ -1229,7 +1229,7 @@ pub const Inspector = struct {
// ImGui completes all its state processing. I don't know how to fix // ImGui completes all its state processing. I don't know how to fix
// this. // this.
for (0..2) |_| { for (0..2) |_| {
cimgui.c.ImGui_ImplMetal_NewFrame(desc.value); cimgui.ImGui_ImplMetal_NewFrame(desc.value);
try self.newFrame(); try self.newFrame();
cimgui.c.igNewFrame(); cimgui.c.igNewFrame();
@ -1251,7 +1251,7 @@ pub const Inspector = struct {
.{desc.value}, .{desc.value},
); );
defer encoder.msgSend(void, objc.sel("endEncoding"), .{}); defer encoder.msgSend(void, objc.sel("endEncoding"), .{});
cimgui.c.ImGui_ImplMetal_RenderDrawData( cimgui.ImGui_ImplMetal_RenderDrawData(
cimgui.c.igGetDrawData(), cimgui.c.igGetDrawData(),
command_buffer.value, command_buffer.value,
encoder.value, encoder.value,