Skip to content

Fix the vulkan-glfw backend #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the vulkan-glfw backend #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/backend_glfw_vulkan.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ pub fn init(init_info: ImGui_ImplVulkan_InitInfo, window: *const anyopaque) void
}

pub fn loadFunctions(
api_version: u32,
loader: fn (function_name: [*:0]const u8, user_data: ?*anyopaque) callconv(.c) ?*anyopaque,
user_data: ?*anyopaque,
) bool {
return backend_vulkan.loadFunctions(loader, user_data);
return backend_vulkan.loadFunctions(api_version, loader, user_data);
}

pub fn deinit() void {
Expand Down
9 changes: 4 additions & 5 deletions src/backend_vulkan.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub const VkPipelineRenderingCreateInfo = extern struct {
};

pub const ImGui_ImplVulkan_InitInfo = extern struct {
api_version: u32,
instance: VkHandle, // VkInstance
physical_device: VkHandle, // VkPhysicalDevice
device: VkHandle, // VkDevice
Expand Down Expand Up @@ -42,18 +43,17 @@ pub fn init(init_info: ImGui_ImplVulkan_InitInfo) void {
if (!ImGui_ImplVulkan_Init(&vk_init)) {
@panic("failed to init Vulkan for ImGui");
}
ImGui_ImplVulkan_CreateFontsTexture();
}

pub fn loadFunctions(
api_version: u32,
loader: fn (function_name: [*:0]const u8, user_data: ?*anyopaque) callconv(.c) ?*anyopaque,
user_data: ?*anyopaque,
) bool {
return ImGui_ImplVulkan_LoadFunctions(loader, user_data);
return ImGui_ImplVulkan_LoadFunctions(api_version, loader, user_data);
}

pub fn deinit() void {
ImGui_ImplVulkan_DestroyFontsTexture();
ImGui_ImplVulkan_Shutdown();
}

Expand Down Expand Up @@ -82,10 +82,9 @@ extern fn ImGui_ImplVulkan_RenderDrawData(
command_buffer: VkHandle, // VkCommandBuffer
pipeline: VkHandle,
) void;
extern fn ImGui_ImplVulkan_CreateFontsTexture() void;
extern fn ImGui_ImplVulkan_DestroyFontsTexture() void;
extern fn ImGui_ImplVulkan_SetMinImageCount(min_image_count: u32) void;
extern fn ImGui_ImplVulkan_LoadFunctions(
api_version: u32,
loader_func: *const fn (function_name: [*:0]const u8, user_data: ?*anyopaque) callconv(.c) ?*anyopaque,
user_data: ?*anyopaque,
) bool;