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

place bit flag align on use site instead of in struct declaration

Browse Source
This commit is contained in:
Robin Voetter
2022-02-25 12:59:30 +01:00
parent 3781fe779c
commit 470615632d
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
generator/vulkan/render.zig
View File

@@ -289,22 +289,24 @@ fn Renderer(comptime WriterType: type) type {
return mem.endsWith(u8, base_name, "Flags"); return mem.endsWith(u8, base_name, "Flags");
} }
fn isInOutPointer(self: Self, ptr: reg.Pointer) !bool { fn resolveDeclaration(self: Self, start_name: []const u8) ?*const reg.DeclarationType {
if (ptr.child.* != .name) { var name = start_name;
return false; return while (true) {
} const decl = self.declarations_by_name.get(name) orelse return null;
var name = ptr.child.name;
const decl = while (true) {
const decl = self.declarations_by_name.get(name) orelse return error.InvalidRegistry;
if (decl.* != .alias) { if (decl.* != .alias) {
break decl; break decl;
} }
name = decl.alias.name; name = decl.alias.name;
} else unreachable; } else unreachable;
}
fn isInOutPointer(self: Self, ptr: reg.Pointer) !bool {
if (ptr.child.* != .name) {
return false;
}
const decl = self.resolveDeclaration(ptr.child.name) orelse return error.InvalidRegistry;
if (decl.* != .container) { if (decl.* != .container) {
return false; return false;
} }
@@ -742,6 +744,7 @@ fn Renderer(comptime WriterType: type) type {
} else { } else {
try self.renderTypeInfo(field.field_type); try self.renderTypeInfo(field.field_type);
try self.renderContainerDefaultField(name, container, field); try self.renderContainerDefaultField(name, container, field);
try self.renderContainerFieldAlignment(field);
try self.writer.writeAll(", "); try self.writer.writeAll(", ");
} }
} }
@@ -749,6 +752,21 @@ fn Renderer(comptime WriterType: type) type {
try self.writer.writeAll("};\n"); try self.writer.writeAll("};\n");
} }
fn renderContainerFieldAlignment(self: *Self, field: reg.Container.Field) !void {
// Flags structures need to explicitly get their proper alignment: alignOf Flags for 32-bit flags, and alignOf Flag64 for 64-bit flags.
const field_type_name = switch (field.field_type) {
.name => |name| name,
else => return,
};
const decl = self.resolveDeclaration(field_type_name) orelse return;
switch (decl.*) {
.bitmask => |mask| {
try self.writer.print(" align(@alignOf({s}))", .{bitmaskFlagsType(mask.bitwidth)});
},
else => {},
}
}
fn renderContainerDefaultField(self: *Self, name: []const u8, container: reg.Container, field: reg.Container.Field) !void { fn renderContainerDefaultField(self: *Self, name: []const u8, container: reg.Container, field: reg.Container.Field) !void {
if (mem.eql(u8, field.name, "pNext")) { if (mem.eql(u8, field.name, "pNext")) {
try self.writer.writeAll(" = null"); try self.writer.writeAll(" = null");
@@ -865,11 +883,7 @@ fn Renderer(comptime WriterType: type) type {
try self.writer.print("_reserved_bit_{}", .{bitpos}); try self.writer.print("_reserved_bit_{}", .{bitpos});
} }
try self.writer.writeAll(": bool "); try self.writer.writeAll(": bool = false,");
if (bitpos == 0) { // Force alignment to integer boundaries
try self.writer.print("align(@alignOf({s})) ", .{flags_type});
}
try self.writer.writeAll("= false, ");
} }
} }
try self.writer.writeAll("pub usingnamespace FlagsMixin("); try self.writer.writeAll("pub usingnamespace FlagsMixin(");