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

update in response to std.builtin.Type field renames

Browse Source
This commit is contained in:
Andrew Kelley
2024-08-30 19:55:03 -07:00
parent d03459819c
commit 28c14dcf37
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vulkan/render.zig
View File

@@ -28,7 +28,7 @@ const preamble =
\\ .C; \\ .C;
\\pub fn FlagsMixin(comptime FlagsType: type) type { \\pub fn FlagsMixin(comptime FlagsType: type) type {
\\ return struct { \\ return struct {
\\ pub const IntType = @typeInfo(FlagsType).Struct.backing_integer.?; \\ pub const IntType = @typeInfo(FlagsType).@"struct".backing_integer.?;
\\ pub fn toInt(self: FlagsType) IntType { \\ pub fn toInt(self: FlagsType) IntType {
\\ return @bitCast(self); \\ return @bitCast(self);
\\ } \\ }
@@ -1259,7 +1259,7 @@ fn Renderer(comptime WriterType: type) type {
\\ pub fn merge(lhs: CommandFlags, rhs: CommandFlags) CommandFlags { \\ pub fn merge(lhs: CommandFlags, rhs: CommandFlags) CommandFlags {
\\ var result: CommandFlags = .{}; \\ var result: CommandFlags = .{};
\\ @setEvalBranchQuota(10_000); \\ @setEvalBranchQuota(10_000);
\\ inline for (@typeInfo(CommandFlags).Struct.fields) |field| { \\ inline for (@typeInfo(CommandFlags).@"struct".fields) |field| {
\\ @field(result, field.name) = @field(lhs, field.name) or @field(rhs, field.name); \\ @field(result, field.name) = @field(lhs, field.name) or @field(rhs, field.name);
\\ } \\ }
\\ return result; \\ return result;
@@ -1267,7 +1267,7 @@ fn Renderer(comptime WriterType: type) type {
\\ pub fn intersect(lhs: CommandFlags, rhs: CommandFlags) CommandFlags { \\ pub fn intersect(lhs: CommandFlags, rhs: CommandFlags) CommandFlags {
\\ var result: CommandFlags = .{}; \\ var result: CommandFlags = .{};
\\ @setEvalBranchQuota(10_000); \\ @setEvalBranchQuota(10_000);
\\ inline for (@typeInfo(CommandFlags).Struct.fields) |field| { \\ inline for (@typeInfo(CommandFlags).@"struct".fields) |field| {
\\ @field(result, field.name) = @field(lhs, field.name) and @field(rhs, field.name); \\ @field(result, field.name) = @field(lhs, field.name) and @field(rhs, field.name);
\\ } \\ }
\\ return result; \\ return result;
@@ -1275,7 +1275,7 @@ fn Renderer(comptime WriterType: type) type {
\\ pub fn complement(self: CommandFlags) CommandFlags { \\ pub fn complement(self: CommandFlags) CommandFlags {
\\ var result: CommandFlags = .{}; \\ var result: CommandFlags = .{};
\\ @setEvalBranchQuota(10_000); \\ @setEvalBranchQuota(10_000);
\\ inline for (@typeInfo(CommandFlags).Struct.fields) |field| { \\ inline for (@typeInfo(CommandFlags).@"struct".fields) |field| {
\\ @field(result, field.name) = !@field(self, field.name); \\ @field(result, field.name) = !@field(self, field.name);
\\ } \\ }
\\ return result; \\ return result;
@@ -1283,14 +1283,14 @@ fn Renderer(comptime WriterType: type) type {
\\ pub fn subtract(lhs: CommandFlags, rhs: CommandFlags) CommandFlags { \\ pub fn subtract(lhs: CommandFlags, rhs: CommandFlags) CommandFlags {
\\ var result: CommandFlags = .{}; \\ var result: CommandFlags = .{};
\\ @setEvalBranchQuota(10_000); \\ @setEvalBranchQuota(10_000);
\\ inline for (@typeInfo(CommandFlags).Struct.fields) |field| { \\ inline for (@typeInfo(CommandFlags).@"struct".fields) |field| {
\\ @field(result, field.name) = @field(lhs, field.name) and !@field(rhs, field.name); \\ @field(result, field.name) = @field(lhs, field.name) and !@field(rhs, field.name);
\\ } \\ }
\\ return result; \\ return result;
\\ } \\ }
\\ pub fn contains(lhs: CommandFlags, rhs: CommandFlags) bool { \\ pub fn contains(lhs: CommandFlags, rhs: CommandFlags) bool {
\\ @setEvalBranchQuota(10_000); \\ @setEvalBranchQuota(10_000);
\\ inline for (@typeInfo(CommandFlags).Struct.fields) |field| { \\ inline for (@typeInfo(CommandFlags).@"struct".fields) |field| {
\\ if (!@field(lhs, field.name) and @field(rhs, field.name)) { \\ if (!@field(lhs, field.name) and @field(rhs, field.name)) {
\\ return false; \\ return false;
\\ } \\ }
@@ -1404,14 +1404,14 @@ fn Renderer(comptime WriterType: type) type {
\\ const Type = std.builtin.Type; \\ const Type = std.builtin.Type;
\\ const fields_len = fields_len: {{ \\ const fields_len = fields_len: {{
\\ var fields_len: u32 = 0; \\ var fields_len: u32 = 0;
\\ for (@typeInfo({0s}CommandFlags).Struct.fields) |field| {{ \\ for (@typeInfo({0s}CommandFlags).@"struct".fields) |field| {{
\\ fields_len += @intCast(@intFromBool(@field(commands, field.name))); \\ fields_len += @intCast(@intFromBool(@field(commands, field.name)));
\\ }} \\ }}
\\ break :fields_len fields_len; \\ break :fields_len fields_len;
\\ }}; \\ }};
\\ var fields: [fields_len]Type.StructField = undefined; \\ var fields: [fields_len]Type.StructField = undefined;
\\ var i: usize = 0; \\ var i: usize = 0;
\\ for (@typeInfo({0s}CommandFlags).Struct.fields) |field| {{ \\ for (@typeInfo({0s}CommandFlags).@"struct".fields) |field| {{
\\ if (@field(commands, field.name)) {{ \\ if (@field(commands, field.name)) {{
\\ const field_tag = std.enums.nameCast(std.meta.FieldEnum({0s}CommandFlags), field.name); \\ const field_tag = std.enums.nameCast(std.meta.FieldEnum({0s}CommandFlags), field.name);
\\ const PfnType = {0s}CommandFlags.CmdType(field_tag); \\ const PfnType = {0s}CommandFlags.CmdType(field_tag);
@@ -1426,7 +1426,7 @@ fn Renderer(comptime WriterType: type) type {
\\ }} \\ }}
\\ }} \\ }}
\\ break :blk @Type(.{{ \\ break :blk @Type(.{{
\\ .Struct = .{{ \\ .@"struct" = .{{
\\ .layout = .auto, \\ .layout = .auto,
\\ .fields = &fields, \\ .fields = &fields,
\\ .decls = &[_]std.builtin.Type.Declaration{{}}, \\ .decls = &[_]std.builtin.Type.Declaration{{}},

4
test/ref_all_decls.zig
View File

@@ -99,13 +99,13 @@ comptime {
fn reallyRefAllDecls(comptime T: type) void { fn reallyRefAllDecls(comptime T: type) void {
switch (@typeInfo(T)) { switch (@typeInfo(T)) {
.Struct, .Union => { .@"struct", .@"union" => {
reallyRefAllContainerDecls(T); reallyRefAllContainerDecls(T);
inline for (std.meta.fields(T)) |field| { inline for (std.meta.fields(T)) |field| {
reallyRefAllDecls(field.type); reallyRefAllDecls(field.type);
} }
}, },
.Enum, .Opaque => { .@"enum", .@"opaque" => {
reallyRefAllContainerDecls(T); reallyRefAllContainerDecls(T);
}, },
else => {}, else => {},