From d19ce1839ec2fd7c018500c56c03e02fd7050f52 Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Wed, 27 Jul 2022 03:08:22 -0700
Subject: [PATCH] remove some messy

---
 src/rendering/vulkan/Renderer.zig |  2 +-
 src/ui/ui.zig                     | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/rendering/vulkan/Renderer.zig b/src/rendering/vulkan/Renderer.zig
index c8bb5a9..9d88e95 100644
--- a/src/rendering/vulkan/Renderer.zig
+++ b/src/rendering/vulkan/Renderer.zig
@@ -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();
diff --git a/src/ui/ui.zig b/src/ui/ui.zig
index d8fd9e3..92ede35 100644
--- a/src/ui/ui.zig
+++ b/src/ui/ui.zig
@@ -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;
     }