forked from mirror/vulkan-zig
Compare commits
17 Commits
fix-window
...
zig-compat
| Author | SHA1 | Date | |
|---|---|---|---|
| d1902bddd6 | |||
|
|
8961518db2 | ||
|
|
7acf3a1163 | ||
|
|
4b7b9a8b94 | ||
|
|
4066c2c526 | ||
|
|
c9c4dae703 | ||
|
|
ecf97034c4 | ||
|
|
3c7d4021e9 | ||
|
|
f879074293 | ||
|
|
571c59180d | ||
|
|
8322c9593f | ||
|
|
33407b8e4e | ||
|
|
93bc6f1ac3 | ||
|
|
bed9e2d224 | ||
|
|
ed429842b8 | ||
|
|
cb618dea81 | ||
|
|
e492b17810 |
@@ -2,7 +2,7 @@
|
||||
.name = .vulkan,
|
||||
.fingerprint = 0xbe155a03c72db6af,
|
||||
.version = "0.0.0",
|
||||
.minimum_zig_version = "0.14.0-dev.1359+e9a00ba7f",
|
||||
.minimum_zig_version = "0.15.1",
|
||||
.paths = .{
|
||||
"build.zig",
|
||||
"LICENSE",
|
||||
|
||||
@@ -35,6 +35,7 @@ pub const GraphicsContext = struct {
|
||||
vkb: BaseWrapper,
|
||||
|
||||
instance: Instance,
|
||||
debug_messenger: vk.DebugUtilsMessengerEXT,
|
||||
surface: vk.SurfaceKHR,
|
||||
pdev: vk.PhysicalDevice,
|
||||
props: vk.PhysicalDeviceProperties,
|
||||
@@ -49,16 +50,17 @@ pub const GraphicsContext = struct {
|
||||
self.allocator = allocator;
|
||||
self.vkb = BaseWrapper.load(c.glfwGetInstanceProcAddress);
|
||||
|
||||
var extension_names = std.ArrayList([*:0]const u8).init(allocator);
|
||||
defer extension_names.deinit();
|
||||
// these extensions are to support vulkan in mac os
|
||||
var extension_names: std.ArrayList([*:0]const u8) = .empty;
|
||||
defer extension_names.deinit(allocator);
|
||||
try extension_names.append(allocator, vk.extensions.ext_debug_utils.name);
|
||||
// the following extensions are to support vulkan in mac os
|
||||
// see https://github.com/glfw/glfw/issues/2335
|
||||
try extension_names.append("VK_KHR_portability_enumeration");
|
||||
try extension_names.append("VK_KHR_get_physical_device_properties2");
|
||||
try extension_names.append(allocator, vk.extensions.khr_portability_enumeration.name);
|
||||
try extension_names.append(allocator, vk.extensions.khr_get_physical_device_properties_2.name);
|
||||
|
||||
var glfw_exts_count: u32 = 0;
|
||||
const glfw_exts = c.glfwGetRequiredInstanceExtensions(&glfw_exts_count);
|
||||
try extension_names.appendSlice(@ptrCast(glfw_exts[0..glfw_exts_count]));
|
||||
try extension_names.appendSlice(allocator, @ptrCast(glfw_exts[0..glfw_exts_count]));
|
||||
|
||||
const instance = try self.vkb.createInstance(&.{
|
||||
.p_application_info = &.{
|
||||
@@ -81,6 +83,22 @@ pub const GraphicsContext = struct {
|
||||
self.instance = Instance.init(instance, vki);
|
||||
errdefer self.instance.destroyInstance(null);
|
||||
|
||||
self.debug_messenger = try self.instance.createDebugUtilsMessengerEXT(&.{
|
||||
.message_severity = .{
|
||||
//.verbose_bit_ext = true,
|
||||
//.info_bit_ext = true,
|
||||
.warning_bit_ext = true,
|
||||
.error_bit_ext = true,
|
||||
},
|
||||
.message_type = .{
|
||||
.general_bit_ext = true,
|
||||
.validation_bit_ext = true,
|
||||
.performance_bit_ext = true,
|
||||
},
|
||||
.pfn_user_callback = &debugUtilsMessengerCallback,
|
||||
.p_user_data = null,
|
||||
}, null);
|
||||
|
||||
self.surface = try createSurface(self.instance, window);
|
||||
errdefer self.instance.destroySurfaceKHR(self.surface, null);
|
||||
|
||||
@@ -107,6 +125,7 @@ pub const GraphicsContext = struct {
|
||||
pub fn deinit(self: GraphicsContext) void {
|
||||
self.dev.destroyDevice(null);
|
||||
self.instance.destroySurfaceKHR(self.surface, null);
|
||||
self.instance.destroyDebugUtilsMessengerEXT(self.debug_messenger, null);
|
||||
self.instance.destroyInstance(null);
|
||||
|
||||
// Don't forget to free the tables to prevent a memory leak.
|
||||
@@ -196,6 +215,17 @@ const QueueAllocation = struct {
|
||||
present_family: u32,
|
||||
};
|
||||
|
||||
fn debugUtilsMessengerCallback(severity: vk.DebugUtilsMessageSeverityFlagsEXT, msg_type: vk.DebugUtilsMessageTypeFlagsEXT, callback_data: ?*const vk.DebugUtilsMessengerCallbackDataEXT, _: ?*anyopaque) callconv(.c) vk.Bool32 {
|
||||
const severity_str = if (severity.verbose_bit_ext) "verbose" else if (severity.info_bit_ext) "info" else if (severity.warning_bit_ext) "warning" else if (severity.error_bit_ext) "error" else "unknown";
|
||||
|
||||
const type_str = if (msg_type.general_bit_ext) "general" else if (msg_type.validation_bit_ext) "validation" else if (msg_type.performance_bit_ext) "performance" else if (msg_type.device_address_binding_bit_ext) "device addr" else "unknown";
|
||||
|
||||
const message: [*c]const u8 = if (callback_data) |cb_data| cb_data.p_message else "NO MESSAGE!";
|
||||
std.debug.print("[{s}][{s}]. Message:\n {s}\n", .{ severity_str, type_str, message });
|
||||
|
||||
return .false;
|
||||
}
|
||||
|
||||
fn pickPhysicalDevice(
|
||||
instance: Instance,
|
||||
allocator: Allocator,
|
||||
@@ -253,7 +283,7 @@ fn allocateQueues(instance: Instance, pdev: vk.PhysicalDevice, allocator: Alloca
|
||||
graphics_family = family;
|
||||
}
|
||||
|
||||
if (present_family == null and (try instance.getPhysicalDeviceSurfaceSupportKHR(pdev, family, surface)) == vk.TRUE) {
|
||||
if (present_family == null and (try instance.getPhysicalDeviceSurfaceSupportKHR(pdev, family, surface)) == .true) {
|
||||
present_family = family;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ pub const Swapchain = struct {
|
||||
.pre_transform = caps.current_transform,
|
||||
.composite_alpha = .{ .opaque_bit_khr = true },
|
||||
.present_mode = present_mode,
|
||||
.clipped = vk.TRUE,
|
||||
.clipped = .true,
|
||||
.old_swapchain = old_handle,
|
||||
}, null) catch {
|
||||
return error.SwapchainCreationFailed;
|
||||
@@ -261,7 +261,7 @@ const SwapImage = struct {
|
||||
}
|
||||
|
||||
fn waitForFence(self: SwapImage, gc: *const GraphicsContext) !void {
|
||||
_ = try gc.dev.waitForFences(1, @ptrCast(&self.frame_fence), vk.TRUE, std.math.maxInt(u64));
|
||||
_ = try gc.dev.waitForFences(1, @ptrCast(&self.frame_fence), .true, std.math.maxInt(u64));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -414,7 +414,7 @@ fn createPipeline(
|
||||
|
||||
const piasci = vk.PipelineInputAssemblyStateCreateInfo{
|
||||
.topology = .triangle_list,
|
||||
.primitive_restart_enable = vk.FALSE,
|
||||
.primitive_restart_enable = .false,
|
||||
};
|
||||
|
||||
const pvsci = vk.PipelineViewportStateCreateInfo{
|
||||
@@ -425,12 +425,12 @@ fn createPipeline(
|
||||
};
|
||||
|
||||
const prsci = vk.PipelineRasterizationStateCreateInfo{
|
||||
.depth_clamp_enable = vk.FALSE,
|
||||
.rasterizer_discard_enable = vk.FALSE,
|
||||
.depth_clamp_enable = .false,
|
||||
.rasterizer_discard_enable = .false,
|
||||
.polygon_mode = .fill,
|
||||
.cull_mode = .{ .back_bit = true },
|
||||
.front_face = .clockwise,
|
||||
.depth_bias_enable = vk.FALSE,
|
||||
.depth_bias_enable = .false,
|
||||
.depth_bias_constant_factor = 0,
|
||||
.depth_bias_clamp = 0,
|
||||
.depth_bias_slope_factor = 0,
|
||||
@@ -439,14 +439,14 @@ fn createPipeline(
|
||||
|
||||
const pmsci = vk.PipelineMultisampleStateCreateInfo{
|
||||
.rasterization_samples = .{ .@"1_bit" = true },
|
||||
.sample_shading_enable = vk.FALSE,
|
||||
.sample_shading_enable = .false,
|
||||
.min_sample_shading = 1,
|
||||
.alpha_to_coverage_enable = vk.FALSE,
|
||||
.alpha_to_one_enable = vk.FALSE,
|
||||
.alpha_to_coverage_enable = .false,
|
||||
.alpha_to_one_enable = .false,
|
||||
};
|
||||
|
||||
const pcbas = vk.PipelineColorBlendAttachmentState{
|
||||
.blend_enable = vk.FALSE,
|
||||
.blend_enable = .false,
|
||||
.src_color_blend_factor = .one,
|
||||
.dst_color_blend_factor = .zero,
|
||||
.color_blend_op = .add,
|
||||
@@ -457,7 +457,7 @@ fn createPipeline(
|
||||
};
|
||||
|
||||
const pcbsci = vk.PipelineColorBlendStateCreateInfo{
|
||||
.logic_op_enable = vk.FALSE,
|
||||
.logic_op_enable = .false,
|
||||
.logic_op = .copy,
|
||||
.attachment_count = 1,
|
||||
.p_attachments = @ptrCast(&pcbas),
|
||||
|
||||
@@ -52,7 +52,7 @@ pub fn isZigPrimitiveType(name: []const u8) bool {
|
||||
return false;
|
||||
}
|
||||
|
||||
pub fn writeIdentifier(w: *std.io.Writer, id: []const u8) !void {
|
||||
pub fn writeIdentifier(w: *std.Io.Writer, id: []const u8) !void {
|
||||
try w.print("{f}", .{std.zig.fmtId(id)});
|
||||
}
|
||||
|
||||
@@ -121,12 +121,12 @@ pub const SegmentIterator = struct {
|
||||
|
||||
pub const IdRenderer = struct {
|
||||
tags: []const []const u8,
|
||||
text_cache: std.ArrayList(u8),
|
||||
text_cache: std.Io.Writer.Allocating,
|
||||
|
||||
pub fn init(allocator: Allocator, tags: []const []const u8) IdRenderer {
|
||||
return .{
|
||||
.tags = tags,
|
||||
.text_cache = std.ArrayList(u8).init(allocator),
|
||||
.text_cache = .init(allocator),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -142,19 +142,19 @@ pub const IdRenderer = struct {
|
||||
if (first) {
|
||||
first = false;
|
||||
} else {
|
||||
try self.text_cache.append('_');
|
||||
try self.text_cache.writer.writeByte('_');
|
||||
}
|
||||
|
||||
for (segment) |c| {
|
||||
try self.text_cache.append(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
|
||||
try self.text_cache.writer.writeByte(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
|
||||
}
|
||||
}
|
||||
|
||||
if (tag) |name| {
|
||||
try self.text_cache.append('_');
|
||||
try self.text_cache.writer.writeByte('_');
|
||||
|
||||
for (name) |c| {
|
||||
try self.text_cache.append(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
|
||||
try self.text_cache.writer.writeByte(if (screaming) std.ascii.toUpper(c) else std.ascii.toLower(c));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -166,7 +166,7 @@ pub const IdRenderer = struct {
|
||||
while (it.next()) |segment| {
|
||||
var i: usize = 0;
|
||||
while (i < segment.len and std.ascii.isDigit(segment[i])) {
|
||||
try self.text_cache.append(segment[i]);
|
||||
try self.text_cache.writer.writeByte(segment[i]);
|
||||
i += 1;
|
||||
}
|
||||
|
||||
@@ -175,26 +175,26 @@ pub const IdRenderer = struct {
|
||||
}
|
||||
|
||||
if (i == 0 and lower_first) {
|
||||
try self.text_cache.append(std.ascii.toLower(segment[i]));
|
||||
try self.text_cache.writer.writeByte(std.ascii.toLower(segment[i]));
|
||||
} else {
|
||||
try self.text_cache.append(std.ascii.toUpper(segment[i]));
|
||||
try self.text_cache.writer.writeByte(std.ascii.toUpper(segment[i]));
|
||||
}
|
||||
lower_first = false;
|
||||
|
||||
for (segment[i + 1 ..]) |c| {
|
||||
try self.text_cache.append(std.ascii.toLower(c));
|
||||
try self.text_cache.writer.writeByte(std.ascii.toLower(c));
|
||||
}
|
||||
}
|
||||
|
||||
if (tag) |name| {
|
||||
try self.text_cache.appendSlice(name);
|
||||
try self.text_cache.writer.writeAll(name);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn renderFmt(self: *IdRenderer, out: *std.Io.Writer, comptime fmt: []const u8, args: anytype) !void {
|
||||
self.text_cache.items.len = 0;
|
||||
try std.fmt.format(self.text_cache.writer(), fmt, args);
|
||||
try writeIdentifier(out, self.text_cache.items);
|
||||
_ = self.text_cache.writer.consumeAll();
|
||||
try self.text_cache.writer.print(fmt, args);
|
||||
try writeIdentifier(out, self.text_cache.writer.buffered());
|
||||
}
|
||||
|
||||
pub fn renderWithCase(self: *IdRenderer, out: *std.Io.Writer, case_style: CaseStyle, id: []const u8) !void {
|
||||
@@ -202,7 +202,7 @@ pub const IdRenderer = struct {
|
||||
// The trailing underscore doesn't need to be removed here as its removed by the SegmentIterator.
|
||||
const adjusted_id = if (tag) |name| id[0 .. id.len - name.len] else id;
|
||||
|
||||
self.text_cache.items.len = 0;
|
||||
_ = self.text_cache.writer.consumeAll();
|
||||
|
||||
switch (case_style) {
|
||||
.snake => try self.renderSnake(false, adjusted_id, tag),
|
||||
@@ -211,7 +211,7 @@ pub const IdRenderer = struct {
|
||||
.camel => try self.renderCamel(false, adjusted_id, tag),
|
||||
}
|
||||
|
||||
try writeIdentifier(out, self.text_cache.items);
|
||||
try writeIdentifier(out, self.text_cache.writer.buffered());
|
||||
}
|
||||
|
||||
pub fn getAuthorTag(self: IdRenderer, id: []const u8) ?[]const u8 {
|
||||
|
||||
27
src/main.zig
27
src/main.zig
@@ -1,4 +1,5 @@
|
||||
const std = @import("std");
|
||||
|
||||
const generator = @import("vulkan/generator.zig");
|
||||
|
||||
fn invalidUsage(prog_name: []const u8, comptime fmt: []const u8, args: anytype) noreturn {
|
||||
@@ -23,13 +24,17 @@ fn reportParseErrors(tree: std.zig.Ast) !void {
|
||||
}
|
||||
}
|
||||
|
||||
fn oomPanic() noreturn {
|
||||
@panic("Out of memory");
|
||||
}
|
||||
|
||||
pub fn main() !void {
|
||||
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
|
||||
defer arena.deinit();
|
||||
const allocator = arena.allocator();
|
||||
|
||||
var args = std.process.argsWithAllocator(allocator) catch |err| switch (err) {
|
||||
error.OutOfMemory => @panic("OOM"),
|
||||
error.OutOfMemory => oomPanic(),
|
||||
};
|
||||
const prog_name = args.next() orelse "vulkan-zig-generator";
|
||||
|
||||
@@ -97,20 +102,19 @@ pub fn main() !void {
|
||||
};
|
||||
|
||||
const cwd = std.fs.cwd();
|
||||
const xml_src = cwd.readFileAlloc(allocator, xml_path, std.math.maxInt(usize)) catch |err| {
|
||||
const xml_src = cwd.readFileAlloc(xml_path, allocator, .unlimited) catch |err| {
|
||||
std.process.fatal("failed to open input file '{s}' ({s})", .{ xml_path, @errorName(err) });
|
||||
};
|
||||
|
||||
const maybe_video_xml_src = if (maybe_video_xml_path) |video_xml_path|
|
||||
cwd.readFileAlloc(allocator, video_xml_path, std.math.maxInt(usize)) catch |err| {
|
||||
cwd.readFileAlloc(video_xml_path, allocator, .unlimited) catch |err| {
|
||||
std.process.fatal("failed to open input file '{s}' ({s})", .{ video_xml_path, @errorName(err) });
|
||||
}
|
||||
else
|
||||
null;
|
||||
|
||||
var out_buffer = std.ArrayList(u8).init(allocator);
|
||||
var w = out_buffer.writer().adaptToNewApi();
|
||||
generator.generate(allocator, api, xml_src, maybe_video_xml_src, &w.new_interface) catch |err| {
|
||||
var aw: std.Io.Writer.Allocating = .init(allocator);
|
||||
generator.generate(allocator, api, xml_src, maybe_video_xml_src, &aw.writer) catch |err| {
|
||||
if (debug) {
|
||||
return err;
|
||||
}
|
||||
@@ -132,15 +136,16 @@ pub fn main() !void {
|
||||
std.log.err("please make a bug report at https://github.com/Snektron/vulkan-zig/issues/", .{});
|
||||
std.process.exit(1);
|
||||
},
|
||||
error.OutOfMemory, error.WriteFailed => @panic("oom"),
|
||||
error.OutOfMemory, error.WriteFailed => oomPanic(),
|
||||
}
|
||||
};
|
||||
|
||||
out_buffer.append(0) catch @panic("oom");
|
||||
aw.writer.writeByte(0) catch oomPanic();
|
||||
|
||||
const src = out_buffer.items[0 .. out_buffer.items.len - 1 :0];
|
||||
const buffered = aw.writer.buffered();
|
||||
const src = buffered[0 .. buffered.len - 1 :0];
|
||||
const tree = std.zig.Ast.parse(allocator, src, .zig) catch |err| switch (err) {
|
||||
error.OutOfMemory => @panic("oom"),
|
||||
error.OutOfMemory => oomPanic(),
|
||||
};
|
||||
|
||||
const formatted = if (tree.errors.len > 0) blk: {
|
||||
@@ -158,7 +163,7 @@ pub fn main() !void {
|
||||
}
|
||||
std.process.exit(1);
|
||||
} else tree.renderAlloc(allocator) catch |err| switch (err) {
|
||||
error.OutOfMemory => @panic("oom"),
|
||||
error.OutOfMemory => oomPanic(),
|
||||
};
|
||||
|
||||
if (std.fs.path.dirname(out_path)) |dir| {
|
||||
|
||||
@@ -457,8 +457,8 @@ fn parseFnPtrSuffix(allocator: Allocator, xctok: *XmlCTokenizer, return_type: Ty
|
||||
// There is no good way to estimate the number of parameters beforehand.
|
||||
// Fortunately, there are usually a relatively low number of parameters to a function pointer,
|
||||
// so an ArrayList backed by an arena allocator is good enough.
|
||||
var params = std.ArrayList(registry.Command.Param).init(allocator);
|
||||
try params.append(.{
|
||||
var params: std.ArrayList(registry.Command.Param) = .empty;
|
||||
try params.append(allocator, .{
|
||||
.name = first_param.name.?,
|
||||
.param_type = first_param.decl_type,
|
||||
.is_buffer_len = false,
|
||||
@@ -473,7 +473,7 @@ fn parseFnPtrSuffix(allocator: Allocator, xctok: *XmlCTokenizer, return_type: Ty
|
||||
}
|
||||
|
||||
const decl = try parseDeclaration(allocator, xctok, ptrs_optional);
|
||||
try params.append(.{
|
||||
try params.append(allocator, .{
|
||||
.name = decl.name orelse return error.MissingTypeIdentifier,
|
||||
.param_type = decl.decl_type,
|
||||
.is_buffer_len = false,
|
||||
@@ -482,7 +482,7 @@ fn parseFnPtrSuffix(allocator: Allocator, xctok: *XmlCTokenizer, return_type: Ty
|
||||
}
|
||||
|
||||
_ = try xctok.nextNoEof();
|
||||
command_ptr.decl_type.command_ptr.params = try params.toOwnedSlice();
|
||||
command_ptr.decl_type.command_ptr.params = try params.toOwnedSlice(allocator);
|
||||
return command_ptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ const EnumFieldMerger = struct {
|
||||
fn putEnumExtension(self: *EnumFieldMerger, enum_name: []const u8, field: reg.Enum.Field) !void {
|
||||
const res = try self.enum_extensions.getOrPut(self.arena, enum_name);
|
||||
if (!res.found_existing) {
|
||||
res.value_ptr.* = std.ArrayListUnmanaged(reg.Enum.Field){};
|
||||
res.value_ptr.* = .empty;
|
||||
}
|
||||
|
||||
try res.value_ptr.append(self.arena, field);
|
||||
|
||||
@@ -28,11 +28,11 @@ pub fn parseXml(
|
||||
|
||||
const allocator = arena.allocator();
|
||||
|
||||
var decls: std.ArrayListUnmanaged(registry.Declaration) = .{};
|
||||
var api_constants: std.ArrayListUnmanaged(registry.ApiConstant) = .{};
|
||||
var tags: std.ArrayListUnmanaged(registry.Tag) = .{};
|
||||
var features: std.ArrayListUnmanaged(registry.Feature) = .{};
|
||||
var extensions: std.ArrayListUnmanaged(registry.Extension) = .{};
|
||||
var decls: std.ArrayList(registry.Declaration) = .empty;
|
||||
var api_constants: std.ArrayList(registry.ApiConstant) = .empty;
|
||||
var tags: std.ArrayList(registry.Tag) = .empty;
|
||||
var features: std.ArrayList(registry.Feature) = .empty;
|
||||
var extensions: std.ArrayList(registry.Extension) = .empty;
|
||||
|
||||
try parseDeclarations(allocator, root, api, &decls);
|
||||
try parseApiConstants(allocator, root, api, &api_constants);
|
||||
@@ -66,7 +66,7 @@ fn parseDeclarations(
|
||||
allocator: Allocator,
|
||||
root: *xml.Element,
|
||||
api: registry.Api,
|
||||
decls: *std.ArrayListUnmanaged(registry.Declaration),
|
||||
decls: *std.ArrayList(registry.Declaration),
|
||||
) !void {
|
||||
const types_elem = root.findChildByTag("types") orelse return error.InvalidRegistry;
|
||||
try decls.ensureUnusedCapacity(allocator, types_elem.children.len);
|
||||
@@ -84,7 +84,7 @@ fn parseTypes(
|
||||
allocator: Allocator,
|
||||
types_elem: *xml.Element,
|
||||
api: registry.Api,
|
||||
decls: *std.ArrayListUnmanaged(registry.Declaration),
|
||||
decls: *std.ArrayList(registry.Declaration),
|
||||
) !void {
|
||||
var it = types_elem.findChildrenByTag("type");
|
||||
while (it.next()) |ty| {
|
||||
@@ -429,7 +429,7 @@ fn parseEnums(
|
||||
allocator: Allocator,
|
||||
root: *xml.Element,
|
||||
api: registry.Api,
|
||||
decls: *std.ArrayListUnmanaged(registry.Declaration),
|
||||
decls: *std.ArrayList(registry.Declaration),
|
||||
) !void {
|
||||
var it = root.findChildrenByTag("enums");
|
||||
while (it.next()) |enums| {
|
||||
@@ -519,7 +519,7 @@ fn parseCommands(
|
||||
allocator: Allocator,
|
||||
commands_elem: *xml.Element,
|
||||
api: registry.Api,
|
||||
decls: *std.ArrayListUnmanaged(registry.Declaration),
|
||||
decls: *std.ArrayList(registry.Declaration),
|
||||
) !void {
|
||||
var it = commands_elem.findChildrenByTag("command");
|
||||
while (it.next()) |elem| {
|
||||
@@ -630,7 +630,7 @@ fn parseApiConstants(
|
||||
allocator: Allocator,
|
||||
root: *xml.Element,
|
||||
api: registry.Api,
|
||||
api_constants: *std.ArrayListUnmanaged(registry.ApiConstant),
|
||||
api_constants: *std.ArrayList(registry.ApiConstant),
|
||||
) !void {
|
||||
const maybe_enums = blk: {
|
||||
var it = root.findChildrenByTag("enums");
|
||||
@@ -672,7 +672,7 @@ fn parseDefines(
|
||||
allocator: Allocator,
|
||||
types: *xml.Element,
|
||||
api: registry.Api,
|
||||
api_constants: *std.ArrayListUnmanaged(registry.ApiConstant),
|
||||
api_constants: *std.ArrayList(registry.ApiConstant),
|
||||
) !void {
|
||||
var it = types.findChildrenByTag("type");
|
||||
while (it.next()) |ty| {
|
||||
@@ -703,7 +703,7 @@ fn parseDefines(
|
||||
fn parseTags(
|
||||
allocator: Allocator,
|
||||
root: *xml.Element,
|
||||
tags: *std.ArrayListUnmanaged(registry.Tag),
|
||||
tags: *std.ArrayList(registry.Tag),
|
||||
) !void {
|
||||
var tags_elem = root.findChildByTag("tags") orelse return;
|
||||
try tags.ensureUnusedCapacity(allocator, tags_elem.children.len);
|
||||
@@ -717,7 +717,7 @@ fn parseTags(
|
||||
}
|
||||
}
|
||||
|
||||
fn parseFeatures(allocator: Allocator, root: *xml.Element, api: registry.Api, features: *std.ArrayListUnmanaged(registry.Feature)) !void {
|
||||
fn parseFeatures(allocator: Allocator, root: *xml.Element, api: registry.Api, features: *std.ArrayList(registry.Feature)) !void {
|
||||
var it = root.findChildrenByTag("feature");
|
||||
while (it.next()) |feature| {
|
||||
if (!requiredByApi(feature, api))
|
||||
@@ -881,7 +881,7 @@ fn parseExtensions(
|
||||
allocator: Allocator,
|
||||
root: *xml.Element,
|
||||
api: registry.Api,
|
||||
extensions: *std.ArrayListUnmanaged(registry.Extension),
|
||||
extensions: *std.ArrayList(registry.Extension),
|
||||
) !void {
|
||||
const extensions_elem = root.findChildByTag("extensions") orelse return error.InvalidRegistry;
|
||||
try extensions.ensureUnusedCapacity(allocator, extensions_elem.children.len);
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
const std = @import("std");
|
||||
const reg = @import("registry.zig");
|
||||
const id_render = @import("../id_render.zig");
|
||||
const cparse = @import("c_parse.zig");
|
||||
const mem = std.mem;
|
||||
const Allocator = mem.Allocator;
|
||||
|
||||
const id_render = @import("../id_render.zig");
|
||||
const CaseStyle = id_render.CaseStyle;
|
||||
const IdRenderer = id_render.IdRenderer;
|
||||
const cparse = @import("c_parse.zig");
|
||||
const reg = @import("registry.zig");
|
||||
|
||||
const preamble =
|
||||
\\// This file is generated from the Khronos Vulkan XML API registry by vulkan-zig.
|
||||
@@ -18,7 +19,7 @@ const preamble =
|
||||
\\
|
||||
\\pub const vulkan_call_conv: std.builtin.CallingConvention = if (builtin.os.tag == .windows and builtin.cpu.arch == .x86)
|
||||
\\ .winapi
|
||||
\\ else if (builtin.abi == .android and (builtin.cpu.arch.isARM() or builtin.cpu.arch.isThumb()) and std.Target.arm.featureSetHas(builtin.cpu.features, .has_v7) and builtin.cpu.arch.ptrBitWidth() == 32)
|
||||
\\ else if (builtin.abi == .android and (builtin.cpu.arch.isArm() or builtin.cpu.arch.isThumb()) and std.Target.arm.featureSetHas(builtin.cpu.features, .has_v7) and builtin.cpu.arch.ptrBitWidth() == 32)
|
||||
\\ // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"
|
||||
\\ // calling convention, i.e. float parameters are passed in registers. This
|
||||
\\ // is true even if the rest of the application passes floats on the stack,
|
||||
@@ -58,8 +59,6 @@ const preamble =
|
||||
\\ return struct {
|
||||
\\ pub fn format(
|
||||
\\ self: FlagsType,
|
||||
\\ comptime _: []const u8,
|
||||
\\ _: std.fmt.FormatOptions,
|
||||
\\ writer: anytype,
|
||||
\\ ) !void {
|
||||
\\ try writer.writeAll(@typeName(FlagsType) ++ "{");
|
||||
@@ -849,6 +848,10 @@ const Renderer = struct {
|
||||
}
|
||||
|
||||
fn renderDecl(self: *Self, decl: reg.Declaration) !void {
|
||||
if (try self.renderSpecial(decl.name)) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (decl.decl_type) {
|
||||
.container => |container| try self.renderContainer(decl.name, container),
|
||||
.enumeration => |enumeration| try self.renderEnumeration(decl.name, enumeration),
|
||||
@@ -862,10 +865,27 @@ const Renderer = struct {
|
||||
}
|
||||
}
|
||||
|
||||
fn renderSpecialContainer(self: *Self, name: []const u8) !bool {
|
||||
fn renderAssign(self: *Self, name: []const u8) !void {
|
||||
try self.writer.writeAll("pub const ");
|
||||
try self.renderName(name);
|
||||
try self.writer.writeAll(" = ");
|
||||
}
|
||||
|
||||
fn renderSpecial(self: *Self, name: []const u8) !bool {
|
||||
const maybe_author = self.id_renderer.getAuthorTag(name);
|
||||
const basename = self.id_renderer.stripAuthorTag(name);
|
||||
if (std.mem.eql(u8, basename, "VkAccelerationStructureInstance")) {
|
||||
if (std.mem.eql(u8, basename, "VkBool32")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.writeAll(
|
||||
\\enum(i32) {
|
||||
\\ false,
|
||||
\\ true,
|
||||
\\ _,
|
||||
\\};
|
||||
\\
|
||||
);
|
||||
} else if (std.mem.eql(u8, basename, "VkAccelerationStructureInstance")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ transform: TransformMatrix{s},
|
||||
@@ -883,8 +903,8 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else if (std.mem.eql(u8, basename, "VkAccelerationStructureSRTMotionInstance")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ transform_t0: SRTData{0s},
|
||||
@@ -903,8 +923,8 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else if (std.mem.eql(u8, basename, "VkAccelerationStructureMatrixMotionInstance")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ transform_t0: TransformMatrix{0s},
|
||||
@@ -923,8 +943,8 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else if (std.mem.eql(u8, basename, "VkClusterAccelerationStructureBuildTriangleClusterInfo")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ cluster_id: u32,
|
||||
@@ -950,8 +970,8 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else if (std.mem.eql(u8, basename, "VkClusterAccelerationStructureBuildTriangleClusterTemplateInfo")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ cluster_id: u32,
|
||||
@@ -978,8 +998,8 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else if (std.mem.eql(u8, basename, "VkClusterAccelerationStructureInstantiateClusterInfo")) {
|
||||
try self.renderAssign(name);
|
||||
try self.writer.print(
|
||||
\\extern struct {{
|
||||
\\ cluster_id_offset: u32,
|
||||
@@ -993,10 +1013,11 @@ const Renderer = struct {
|
||||
,
|
||||
.{maybe_author orelse ""},
|
||||
);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
fn renderSimpleBitContainer(self: *Self, container: reg.Container) !bool {
|
||||
@@ -1052,10 +1073,6 @@ const Renderer = struct {
|
||||
return;
|
||||
}
|
||||
|
||||
if (try self.renderSpecialContainer(name)) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (container.fields) |field| {
|
||||
if (field.bits != null) {
|
||||
return error.UnhandledBitfieldStruct;
|
||||
@@ -1110,7 +1127,7 @@ const Renderer = struct {
|
||||
try self.writer.writeAll(" = .");
|
||||
try self.writeIdentifierWithCase(.snake, stype["VK_STRUCTURE_TYPE_".len..]);
|
||||
} else if (field.field_type == .name and mem.eql(u8, "VkBool32", field.field_type.name) and isFeatureStruct(name, container.extends)) {
|
||||
try self.writer.writeAll(" = FALSE");
|
||||
try self.writer.writeAll(" = .false");
|
||||
} else if (field.is_optional) {
|
||||
if (field.field_type == .name) {
|
||||
const field_type_name = field.field_type.name;
|
||||
@@ -1121,6 +1138,8 @@ const Renderer = struct {
|
||||
try self.writer.writeAll(" = .{}");
|
||||
} else if (decl_type == .typedef and decl_type.typedef == .command_ptr) {
|
||||
try self.writer.writeAll(" = null");
|
||||
} else if (mem.eql(u8, "VkBool32", field.field_type.name)) {
|
||||
try self.writer.writeAll(" = .false");
|
||||
} else if ((decl_type == .typedef and builtin_types.has(decl_type.typedef.name)) or
|
||||
(decl_type == .foreign and builtin_types.has(field_type_name)))
|
||||
{
|
||||
@@ -1810,12 +1829,13 @@ const Renderer = struct {
|
||||
}
|
||||
|
||||
fn extractReturns(self: *Self, command: reg.Command) ![]const ReturnValue {
|
||||
var returns = std.ArrayList(ReturnValue).init(self.allocator);
|
||||
const allocator = self.allocator;
|
||||
var returns: std.ArrayList(ReturnValue) = .empty;
|
||||
|
||||
if (command.return_type.* == .name) {
|
||||
const return_name = command.return_type.name;
|
||||
if (!mem.eql(u8, return_name, "void") and !mem.eql(u8, return_name, "VkResult")) {
|
||||
try returns.append(.{
|
||||
try returns.append(allocator, .{
|
||||
.name = "return_value",
|
||||
.return_value_type = command.return_type.*,
|
||||
.origin = .inner_return_value,
|
||||
@@ -1828,7 +1848,7 @@ const Renderer = struct {
|
||||
return error.InvalidRegistry;
|
||||
}
|
||||
|
||||
try returns.append(.{
|
||||
try returns.append(allocator, .{
|
||||
.name = "result",
|
||||
.return_value_type = command.return_type.*,
|
||||
.origin = .inner_return_value,
|
||||
@@ -1839,7 +1859,7 @@ const Renderer = struct {
|
||||
|
||||
for (command.params) |param| {
|
||||
if ((try self.classifyParam(param)) == .out_pointer) {
|
||||
try returns.append(.{
|
||||
try returns.append(allocator, .{
|
||||
.name = derefName(param.name),
|
||||
.return_value_type = param.param_type.pointer.child.*,
|
||||
.origin = .parameter,
|
||||
@@ -1847,7 +1867,7 @@ const Renderer = struct {
|
||||
}
|
||||
}
|
||||
|
||||
return try returns.toOwnedSlice();
|
||||
return try returns.toOwnedSlice(allocator);
|
||||
}
|
||||
|
||||
fn renderReturnStructName(self: *Self, command_name: []const u8) !void {
|
||||
|
||||
16
src/xml.zig
16
src/xml.zig
@@ -439,15 +439,15 @@ fn parseElement(parser: *Parser, alloc: Allocator, comptime kind: ElementKind) !
|
||||
},
|
||||
};
|
||||
|
||||
var attributes = std.ArrayList(Attribute).init(alloc);
|
||||
defer attributes.deinit();
|
||||
var attributes: std.ArrayList(Attribute) = .empty;
|
||||
defer attributes.deinit(alloc);
|
||||
|
||||
var children = std.ArrayList(Content).init(alloc);
|
||||
defer children.deinit();
|
||||
var children: std.ArrayList(Content) = .empty;
|
||||
defer children.deinit(alloc);
|
||||
|
||||
while (parser.eatWs()) {
|
||||
const attr = (try parseAttr(parser, alloc)) orelse break;
|
||||
try attributes.append(attr);
|
||||
try attributes.append(alloc, attr);
|
||||
}
|
||||
|
||||
switch (kind) {
|
||||
@@ -464,7 +464,7 @@ fn parseElement(parser: *Parser, alloc: Allocator, comptime kind: ElementKind) !
|
||||
}
|
||||
|
||||
const content = try parseContent(parser, alloc);
|
||||
try children.append(content);
|
||||
try children.append(alloc, content);
|
||||
}
|
||||
|
||||
const closing_tag = try parseNameNoDupe(parser);
|
||||
@@ -481,8 +481,8 @@ fn parseElement(parser: *Parser, alloc: Allocator, comptime kind: ElementKind) !
|
||||
const element = try alloc.create(Element);
|
||||
element.* = .{
|
||||
.tag = try alloc.dupe(u8, tag),
|
||||
.attributes = try attributes.toOwnedSlice(),
|
||||
.children = try children.toOwnedSlice(),
|
||||
.attributes = try attributes.toOwnedSlice(alloc),
|
||||
.children = try children.toOwnedSlice(alloc),
|
||||
};
|
||||
return element;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user