vv
/
efemra
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

remove some messy

This commit is contained in:
Vivianne 2022-07-27 03:08:22 -07:00
parent 50b68e34b6
commit d19ce1839e
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rendering/vulkan/Renderer.zig
View File

@ -39,7 +39,7 @@ pub fn init() !Self {
var window = try windowInit(&instance);
errdefer window.deinit(&instance);
try ui.init(&window);
try ui.init(&window.handle);
const device = try Device.init(&instance, &window);
errdefer device.deinit();

11
src/ui/ui.zig
View File

@ -6,18 +6,11 @@ const ig_impl_glfw = @import("imgui_impl_glfw.zig");
const ProfileMark = @import("../common/profiler.zig").ProfileMark;
// TODO messy
const Window = @import("../rendering/vulkan/display.zig").Window;
const Instance = @import("../rendering/vulkan/instance.zig").Instance;
const Device = @import("../rendering/vulkan/device.zig").Device;
const queues = @import("../rendering/vulkan/queues.zig");
const Bindings = @import("../rendering/vulkan/Bindings.zig");
// TODO memory
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
const allocator = gpa.allocator();
pub fn init(window: *Window) !void {
pub fn init(window: *glfw.Window) !void {
ig.CHECKVERSION();
// TODO
@ -26,7 +19,7 @@ pub fn init(window: *Window) !void {
_ = ig.CreateContext();
errdefer ig.DestroyContext();
if (!ig_impl_glfw.InitForVulkan(&window.handle, false)) {
if (!ig_impl_glfw.InitForVulkan(window, false)) {
return error.ImGuiFailedToInitialize;
}