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

Merge pull request #116 from antlilja/fix-casts

Browse Source 
Fix old style casts in generated vk.zig
This commit is contained in:
Robin Voetter
2024-01-18 16:32:07 +01:00
committed by GitHub
parent 290aaca5b8 e72a6bb2d0
commit d5e577f3f0
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
generator/vulkan/render.zig
View File

@@ -29,10 +29,10 @@ const preamble =
\\ 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(IntType, self); \\ return @bitCast(self);
\\ } \\ }
\\ pub fn fromInt(flags: IntType) FlagsType { \\ pub fn fromInt(flags: IntType) FlagsType {
\\ return @bitCast(FlagsType, flags); \\ return @bitCast(flags);
\\ } \\ }
\\ pub fn merge(lhs: FlagsType, rhs: FlagsType) FlagsType { \\ pub fn merge(lhs: FlagsType, rhs: FlagsType) FlagsType {
\\ return fromInt(toInt(lhs) | toInt(rhs)); \\ return fromInt(toInt(lhs) | toInt(rhs));
@@ -82,16 +82,16 @@ const preamble =
\\ return (@as(u32, variant) << 29) | (@as(u32, major) << 22) | (@as(u32, minor) << 12) | patch; \\ return (@as(u32, variant) << 29) | (@as(u32, major) << 22) | (@as(u32, minor) << 12) | patch;
\\} \\}
\\pub fn apiVersionVariant(version: u32) u3 { \\pub fn apiVersionVariant(version: u32) u3 {
\\ return @truncate(u3, version >> 29); \\ return @truncate(version >> 29);
\\} \\}
\\pub fn apiVersionMajor(version: u32) u7 { \\pub fn apiVersionMajor(version: u32) u7 {
\\ return @truncate(u7, version >> 22); \\ return @truncate(version >> 22);
\\} \\}
\\pub fn apiVersionMinor(version: u32) u10 { \\pub fn apiVersionMinor(version: u32) u10 {
\\ return @truncate(u10, version >> 12); \\ return @truncate(version >> 12);
\\} \\}
\\pub fn apiVersionPatch(version: u32) u12 { \\pub fn apiVersionPatch(version: u32) u12 {
\\ return @truncate(u12, version); \\ return @truncate(version);
\\} \\}
\\ \\
; ;
@@ -1192,7 +1192,7 @@ fn Renderer(comptime WriterType: type) 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(u32, @boolToInt(@field(cmds, field.name))); \\ fields_len += @intCast(@intFromBool(@field(cmds, field.name)));
\\ }} \\ }}
\\ break :fields_len fields_len; \\ break :fields_len fields_len;
\\ }}; \\ }};
@@ -1267,18 +1267,18 @@ fn Renderer(comptime WriterType: type) type {
\\pub fn load({[params]s}) error{{CommandLoadFailure}}!Self {{ \\pub fn load({[params]s}) error{{CommandLoadFailure}}!Self {{
\\ var self: Self = undefined; \\ var self: Self = undefined;
\\ inline for (std.meta.fields(Dispatch)) |field| {{ \\ inline for (std.meta.fields(Dispatch)) |field| {{
\\ const name = @ptrCast([*:0]const u8, field.name ++ "\x00"); \\ const name: [*:0]const u8 = @ptrCast(field.name ++ "\x00");
\\ const cmd_ptr = loader({[first_arg]s}, name) orelse return error.CommandLoadFailure; \\ const cmd_ptr = loader({[first_arg]s}, name) orelse return error.CommandLoadFailure;
\\ @field(self.dispatch, field.name) = @ptrCast(field.type, cmd_ptr); \\ @field(self.dispatch, field.name) = @ptrCast(cmd_ptr);
\\ }} \\ }}
\\ return self; \\ return self;
\\}} \\}}
\\pub fn loadNoFail({[params]s}) Self {{ \\pub fn loadNoFail({[params]s}) Self {{
\\ var self: Self = undefined; \\ var self: Self = undefined;
\\ inline for (std.meta.fields(Dispatch)) |field| {{ \\ inline for (std.meta.fields(Dispatch)) |field| {{
\\ const name = @ptrCast([*:0]const u8, field.name ++ "\x00"); \\ const name: [*:0]const u8 = @ptrCast(field.name ++ "\x00");
\\ const cmd_ptr = loader({[first_arg]s}, name) orelse undefined; \\ const cmd_ptr = loader({[first_arg]s}, name) orelse undefined;
\\ @field(self.dispatch, field.name) = @ptrCast(field.type, cmd_ptr); \\ @field(self.dispatch, field.name) = @ptrCast(cmd_ptr);
\\ }} \\ }}
\\ return self; \\ return self;
\\}} \\}}