From 5afeb68873763586daa108c14c11ebd47d3fcb5e Mon Sep 17 00:00:00 2001 From: InKryption <59504965+InKryption@users.noreply.github.com> Date: Wed, 3 Nov 2021 21:26:49 +0000 Subject: [PATCH 1/3] Change 'std.os.HINSTANCE' to 'std.os.windows.HINSTANCE' I got a compile error for this after playing around and doing 'vk.InstanceWrapper(std.enums.values(vk.InstanceCommand))', where the compiler thusly complained that there is no declaration for `HINSTANCE` inside `std.os`. --- generator/vulkan/render.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig index 3dfb8c0..8a4fe4e 100644 --- a/generator/vulkan/render.zig +++ b/generator/vulkan/render.zig @@ -95,7 +95,7 @@ const foreign_types = std.ComptimeStringMap([]const u8, .{ .{ "RROutput", @typeName(c_ulong) }, .{ "wl_display", "opaque {}" }, .{ "wl_surface", "opaque {}" }, - .{ "HINSTANCE", "std.os.HINSTANCE" }, + .{ "HINSTANCE", "std.os.windows.HINSTANCE" }, .{ "HWND", "*opaque {}" }, .{ "HMONITOR", "*opaque {}" }, .{ "HANDLE", "std.os.HANDLE" }, From 941a940122a357bd44ed7ea656edc9c70790f503 Mon Sep 17 00:00:00 2001 From: InKryption <59504965+InKryption@users.noreply.github.com> Date: Wed, 3 Nov 2021 21:40:23 +0000 Subject: [PATCH 2/3] Fix other references to `std.os.windows` decls. I noticed these are also incorrectly referencing windows decls inside std.os. --- generator/vulkan/render.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig index 8a4fe4e..048db8f 100644 --- a/generator/vulkan/render.zig +++ b/generator/vulkan/render.zig @@ -98,10 +98,10 @@ const foreign_types = std.ComptimeStringMap([]const u8, .{ .{ "HINSTANCE", "std.os.windows.HINSTANCE" }, .{ "HWND", "*opaque {}" }, .{ "HMONITOR", "*opaque {}" }, - .{ "HANDLE", "std.os.HANDLE" }, + .{ "HANDLE", "std.os.windows.HANDLE" }, .{ "SECURITY_ATTRIBUTES", "std.os.SECURITY_ATTRIBUTES" }, - .{ "DWORD", "std.os.DWORD" }, - .{ "LPCWSTR", "std.os.LPCWSTR" }, + .{ "DWORD", "std.os.windows.DWORD" }, + .{ "LPCWSTR", "std.os.windows.LPCWSTR" }, .{ "xcb_connection_t", "opaque {}" }, .{ "xcb_visualid_t", @typeName(u32) }, .{ "xcb_window_t", @typeName(u32) }, From 596672d6318d29b5952426518a2db36fbc35f79f Mon Sep 17 00:00:00 2001 From: InKryption <59504965+InKryption@users.noreply.github.com> Date: Wed, 3 Nov 2021 22:04:52 +0000 Subject: [PATCH 3/3] Fix HWND reference --- generator/vulkan/render.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig index 048db8f..9596d25 100644 --- a/generator/vulkan/render.zig +++ b/generator/vulkan/render.zig @@ -96,7 +96,7 @@ const foreign_types = std.ComptimeStringMap([]const u8, .{ .{ "wl_display", "opaque {}" }, .{ "wl_surface", "opaque {}" }, .{ "HINSTANCE", "std.os.windows.HINSTANCE" }, - .{ "HWND", "*opaque {}" }, + .{ "HWND", "std.os.windows.HWND" }, .{ "HMONITOR", "*opaque {}" }, .{ "HANDLE", "std.os.windows.HANDLE" }, .{ "SECURITY_ATTRIBUTES", "std.os.SECURITY_ATTRIBUTES" },