allemang.d/zig-experiments
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up hook invocation

Browse Source
This commit is contained in:
David Allemang
2024-07-09 23:02:24 -04:00
parent 4e2cf3eb3b
commit cb8684cbf3
5 changed files with 62 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/nu/ImGui.zig
View File

@@ -5,32 +5,34 @@ const std = @import("std");
const vk = @import("vk");
const nu = @import("../nu.zig");
const au = @import("Render/au.zig");
const Render = @import("Render.zig");
const Window = @import("Window.zig");
const im = @import("cimgui");
pub usingnamespace im;
pub fn loader_wrapper(procname: [*c]const u8, _: ?*anyopaque) callconv(.C) vk.PfnVoidFunction {
return au.glfwGetInstanceProcAddress(au.I.handle, procname);
}
var ctx: *im.c.ImGuiContext = undefined;
var ctx: *im.ImGuiContext = undefined;
var descriptor_pool: vk.DescriptorPool = undefined;
pub fn init() !void {
ctx = im.c.igCreateContext(null) orelse {
ctx = im.igCreateContext(null) orelse {
return error.igCreateContextFailed;
};
errdefer im.c.igDestroyContext(ctx);
errdefer im.igDestroyContext(ctx);
if (!im.c.ImGui_ImplVulkan_LoadFunctions(loader_wrapper, null)) {
if (!im.impl.ImGui_ImplVulkan_LoadFunctions(loader_wrapper, null)) {
return error.igVulkanLoadFunctionsFailed;
}
if (!im.c.ImGui_ImplGlfw_InitForVulkan(@ptrCast(Window.handle), true)) {
if (!im.impl.ImGui_ImplGlfw_InitForVulkan(@ptrCast(Window.handle), true)) {
return error.igGlfwInitFailed;
}
errdefer im.c.ImGui_ImplGlfw_Shutdown();
errdefer im.impl.ImGui_ImplGlfw_Shutdown();
descriptor_pool = try au.D.createDescriptorPool(&vk.DescriptorPoolCreateInfo{
.flags = .{ .free_descriptor_set_bit = true },
@@ -43,7 +45,7 @@ pub fn init() !void {
}, null);
errdefer au.D.destroyDescriptorPool(descriptor_pool, null);
if (im.c.ImGui_ImplVulkan_Init(@constCast(&im.c.ImGui_ImplVulkan_InitInfo{
if (im.impl.ImGui_ImplVulkan_Init(@constCast(&im.impl.ImGui_ImplVulkan_InitInfo{
.Instance = @ptrFromInt(@intFromEnum(au.I.handle)),
.PhysicalDevice = @ptrFromInt(@intFromEnum(au.device_config.pdev)),
.Device = @ptrFromInt(@intFromEnum(au.D.handle)),
@@ -68,9 +70,9 @@ pub fn init() !void {
})) != true) {
return error.igVulkanInitFailed;
}
errdefer im.c.ImGui_ImplVulkan_Shutdown();
errdefer im.impl.ImGui_ImplVulkan_Shutdown();
if (!im.c.ImGui_ImplVulkan_CreateFontsTexture()) {
if (!im.impl.ImGui_ImplVulkan_CreateFontsTexture()) {
return error.igVulkanFontTextureFailed;
}
@@ -79,27 +81,27 @@ pub fn init() !void {
}
pub fn frame() void {
im.c.ImGui_ImplGlfw_NewFrame();
im.c.ImGui_ImplVulkan_NewFrame();
im.c.igNewFrame();
im.impl.ImGui_ImplGlfw_NewFrame();
im.impl.ImGui_ImplVulkan_NewFrame();
im.igNewFrame();
im.c.igShowDemoWindow(null);
im.igShowDemoWindow(null);
im.c.igEndFrame();
im.c.igRender();
im.igEndFrame();
im.igRender();
}
pub fn deinit() void {
Render.remove_present_callback(present);
im.c.ImGui_ImplVulkan_Shutdown();
im.impl.ImGui_ImplVulkan_Shutdown();
au.D.destroyDescriptorPool(descriptor_pool, null);
im.c.ImGui_ImplGlfw_Shutdown();
im.c.igDestroyContext(ctx);
im.impl.ImGui_ImplGlfw_Shutdown();
im.igDestroyContext(ctx);
}
pub fn present(cmd: au.CommandBufferProxy) void {
im.c.ImGui_ImplVulkan_RenderDrawData(
im.c.igGetDrawData(),
im.impl.ImGui_ImplVulkan_RenderDrawData(
@ptrCast(im.igGetDrawData()),
@ptrFromInt(@intFromEnum(cmd.handle)),
null,
);

90
src/nu/Render/au/ui.zig
View File

@@ -1,90 +0,0 @@
const std = @import("std");
const vk = @import("vk");
const im = @import("cimgui");
const au = @import("../au.zig");
const c = @import("../c.zig");
pub usingnamespace im.c;
pub fn loader_wrapper(procname: [*c]const u8, _: ?*anyopaque) callconv(.C) vk.PfnVoidFunction {
return c.glfwGetInstanceProcAddress(au.I.handle, procname);
}
var descriptor_pool: vk.DescriptorPool = undefined;
pub fn init(frames_in_flight: usize) !*im.c.ImGuiContext {
const ctx = im.c.igCreateContext(null) orelse return error.igCreateContextFailed;
errdefer im.c.igDestroyContext(ctx);
if (im.c.ImGui_ImplVulkan_LoadFunctions(loader_wrapper, null) != true) {
return error.igVulkanLoadFunctionsFailed;
}
if (im.c.ImGui_ImplGlfw_InitForVulkan(@ptrCast(au.W.handle), true) != true) {
return error.igGlfwInitFailed;
}
errdefer im.c.ImGui_ImplGlfw_Shutdown();
descriptor_pool = try au.D.createDescriptorPool(&vk.DescriptorPoolCreateInfo{
.flags = .{ .free_descriptor_set_bit = true },
.pool_size_count = 1,
.p_pool_sizes = &.{vk.DescriptorPoolSize{ .descriptor_count = 32, .type = .combined_image_sampler }},
.max_sets = 32,
}, null);
errdefer au.D.destroyDescriptorPool(descriptor_pool, null);
if (im.c.ImGui_ImplVulkan_Init(@constCast(&im.c.ImGui_ImplVulkan_InitInfo{
.Instance = @ptrFromInt(@intFromEnum(au.I.handle)),
.PhysicalDevice = @ptrFromInt(@intFromEnum(au.device_config.pdev)),
.Device = @ptrFromInt(@intFromEnum(au.D.handle)),
.QueueFamily = au.device_config.family,
.Queue = @ptrFromInt(@intFromEnum(au.Q.handle)),
.DescriptorPool = @ptrFromInt(@intFromEnum(descriptor_pool)),
.RenderPass = null,
.MinImageCount = 2,
.ImageCount = @intCast(frames_in_flight),
.PipelineRenderingCreateInfo = @bitCast(vk.PipelineRenderingCreateInfo{
.view_mask = 0,
.depth_attachment_format = .undefined,
.stencil_attachment_format = .undefined,
.color_attachment_count = 1,
.p_color_attachment_formats = &.{au.device_config.format.format},
}),
.MSAASamples = 0,
.PipelineCache = null,
.Subpass = 0,
.UseDynamicRendering = true,
.Allocator = null,
})) != true) {
return error.igVulkanInitFailed;
}
errdefer im.c.ImGui_ImplVulkan_Shutdown();
if (im.c.ImGui_ImplVulkan_CreateFontsTexture() != true) {
return error.igVulkanFontTextureFailed;
}
return ctx;
}
pub fn deinit(ctx: *im.c.ImGuiContext) void {
im.c.ImGui_ImplVulkan_Shutdown();
au.D.destroyDescriptorPool(descriptor_pool, null);
im.c.ImGui_ImplGlfw_Shutdown();
im.c.igDestroyContext(ctx);
}
pub fn NewFrame() void {
im.c.ImGui_ImplGlfw_NewFrame();
im.c.ImGui_ImplVulkan_NewFrame();
im.c.igNewFrame();
}
pub fn EndFrame() void {
im.c.igEndFrame();
im.c.igRender();
}
pub fn Draw(cmd: au.CommandBufferProxy) void {
im.c.ImGui_ImplVulkan_RenderDrawData(im.c.igGetDrawData(), @ptrFromInt(@intFromEnum(cmd.handle)), null);
}