allemang.d/vulkan-zig
1
0
Fork 0
forked from mirror/vulkan-zig
Code Pull Requests Activity

Merge pull request #99 from lefp/optional-pointer-params

Browse Source 
Nullable pointer parameters
This commit is contained in:
Robin Voetter
2023-07-12 10:57:33 +02:00
committed by GitHub
parent 086276bd05 c7d3723710
commit 9743c9b1d3
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator/vulkan/c_parse.zig
View File

@@ -449,6 +449,7 @@ fn parseFnPtrSuffix(allocator: Allocator, xctok: *XmlCTokenizer, return_type: Ty
.name = first_param.name.?, .name = first_param.name.?,
.param_type = first_param.decl_type, .param_type = first_param.decl_type,
.is_buffer_len = false, .is_buffer_len = false,
.is_optional = false,
}); });
while (true) { while (true) {
@@ -463,6 +464,7 @@ fn parseFnPtrSuffix(allocator: Allocator, xctok: *XmlCTokenizer, return_type: Ty
.name = decl.name orelse return error.MissingTypeIdentifier, .name = decl.name orelse return error.MissingTypeIdentifier,
.param_type = decl.decl_type, .param_type = decl.decl_type,
.is_buffer_len = false, .is_buffer_len = false,
.is_optional = false,
}); });
} }

13
generator/vulkan/parse.zig
View File

@@ -278,7 +278,7 @@ fn lenToPointer(fields: Fields, len: []const u8) std.meta.Tuple(&.{ registry.Poi
for (params) |*param| { for (params) |*param| {
if (mem.eql(u8, param.name, len)) { if (mem.eql(u8, param.name, len)) {
param.is_buffer_len = true; param.is_buffer_len = true;
return .{ .{ .other_field = param.name }, false }; return .{ .{ .other_field = param.name }, param.is_optional };
} }
} }
}, },
@@ -499,7 +499,18 @@ fn parseCommand(allocator: Allocator, elem: *xml.Element, api: registry.Api) !re
.name = decl.name, .name = decl.name,
.param_type = decl.decl_type.typedef, .param_type = decl.decl_type.typedef,
.is_buffer_len = false, .is_buffer_len = false,
.is_optional = false,
}; };
if (param.getAttribute("optional")) |optionals| {
var optional_it = mem.split(u8, optionals, ",");
if (optional_it.next()) |first_optional| {
params[i].is_optional = mem.eql(u8, first_optional, "true");
} else {
// Optional is empty, probably incorrect.
return error.InvalidRegistry;
}
}
i += 1; i += 1;
} }

1
generator/vulkan/registry.zig
View File

@@ -111,6 +111,7 @@ pub const Command = struct {
name: []const u8, name: []const u8,
param_type: TypeInfo, param_type: TypeInfo,
is_buffer_len: bool, is_buffer_len: bool,
is_optional: bool,
}; };
params: []Param, params: []Param,