mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv spec: do not align packed struct fields

Browse Source
This commit is contained in:
Veikka Tuominen 2022-02-24 18:39:06 +02:00
parent b034c45b2b
commit cbd5d6c704
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/codegen/spirv/spec.zig
View File

@ -1206,7 +1206,7 @@ pub const Opcode = enum(u16) {
} }
}; };
pub const ImageOperands = packed struct { pub const ImageOperands = packed struct {
Bias: bool align(@alignOf(u32)) = false, Bias: bool = false,
Lod: bool = false, Lod: bool = false,
Grad: bool = false, Grad: bool = false,
ConstOffset: bool = false, ConstOffset: bool = false,
@ -1280,7 +1280,7 @@ pub const ImageOperands = packed struct {
}; };
}; };
pub const FPFastMathMode = packed struct { pub const FPFastMathMode = packed struct {
NotNaN: bool align(@alignOf(u32)) = false, NotNaN: bool = false,
NotInf: bool = false, NotInf: bool = false,
NSZ: bool = false, NSZ: bool = false,
AllowRecip: bool = false, AllowRecip: bool = false,
@ -1314,7 +1314,7 @@ pub const FPFastMathMode = packed struct {
_reserved_bit_31: bool = false, _reserved_bit_31: bool = false,
}; };
pub const SelectionControl = packed struct { pub const SelectionControl = packed struct {
Flatten: bool align(@alignOf(u32)) = false, Flatten: bool = false,
DontFlatten: bool = false, DontFlatten: bool = false,
_reserved_bit_2: bool = false, _reserved_bit_2: bool = false,
_reserved_bit_3: bool = false, _reserved_bit_3: bool = false,
@ -1348,7 +1348,7 @@ pub const SelectionControl = packed struct {
_reserved_bit_31: bool = false, _reserved_bit_31: bool = false,
}; };
pub const LoopControl = packed struct { pub const LoopControl = packed struct {
Unroll: bool align(@alignOf(u32)) = false, Unroll: bool = false,
DontUnroll: bool = false, DontUnroll: bool = false,
DependencyInfinite: bool = false, DependencyInfinite: bool = false,
DependencyLength: bool = false, DependencyLength: bool = false,
@ -1417,7 +1417,7 @@ pub const LoopControl = packed struct {
}; };
}; };
pub const FunctionControl = packed struct { pub const FunctionControl = packed struct {
Inline: bool align(@alignOf(u32)) = false, Inline: bool = false,
DontInline: bool = false, DontInline: bool = false,
Pure: bool = false, Pure: bool = false,
Const: bool = false, Const: bool = false,
@ -1451,7 +1451,7 @@ pub const FunctionControl = packed struct {
_reserved_bit_31: bool = false, _reserved_bit_31: bool = false,
}; };
pub const MemorySemantics = packed struct { pub const MemorySemantics = packed struct {
_reserved_bit_0: bool align(@alignOf(u32)) = false, _reserved_bit_0: bool = false,
Acquire: bool = false, Acquire: bool = false,
Release: bool = false, Release: bool = false,
AcquireRelease: bool = false, AcquireRelease: bool = false,
@ -1489,7 +1489,7 @@ pub const MemorySemantics = packed struct {
pub const MakeVisibleKHR: MemorySemantics = .{ .MakeVisible = true }; pub const MakeVisibleKHR: MemorySemantics = .{ .MakeVisible = true };
}; };
pub const MemoryAccess = packed struct { pub const MemoryAccess = packed struct {
Volatile: bool align(@alignOf(u32)) = false, Volatile: bool = false,
Aligned: bool = false, Aligned: bool = false,
Nontemporal: bool = false, Nontemporal: bool = false,
MakePointerAvailable: bool = false, MakePointerAvailable: bool = false,
@ -1562,7 +1562,7 @@ pub const MemoryAccess = packed struct {
}; };
}; };
pub const KernelProfilingInfo = packed struct { pub const KernelProfilingInfo = packed struct {
CmdExecTime: bool align(@alignOf(u32)) = false, CmdExecTime: bool = false,
_reserved_bit_1: bool = false, _reserved_bit_1: bool = false,
_reserved_bit_2: bool = false, _reserved_bit_2: bool = false,
_reserved_bit_3: bool = false, _reserved_bit_3: bool = false,
@ -1596,7 +1596,7 @@ pub const KernelProfilingInfo = packed struct {
_reserved_bit_31: bool = false, _reserved_bit_31: bool = false,
}; };
pub const RayFlags = packed struct { pub const RayFlags = packed struct {
OpaqueKHR: bool align(@alignOf(u32)) = false, OpaqueKHR: bool = false,
NoOpaqueKHR: bool = false, NoOpaqueKHR: bool = false,
TerminateOnFirstHitKHR: bool = false, TerminateOnFirstHitKHR: bool = false,
SkipClosestHitShaderKHR: bool = false, SkipClosestHitShaderKHR: bool = false,
@ -1630,7 +1630,7 @@ pub const RayFlags = packed struct {
_reserved_bit_31: bool = false, _reserved_bit_31: bool = false,
}; };
pub const FragmentShadingRate = packed struct { pub const FragmentShadingRate = packed struct {
Vertical2Pixels: bool align(@alignOf(u32)) = false, Vertical2Pixels: bool = false,
Vertical4Pixels: bool = false, Vertical4Pixels: bool = false,
Horizontal2Pixels: bool = false, Horizontal2Pixels: bool = false,
Horizontal4Pixels: bool = false, Horizontal4Pixels: bool = false,

6
tools/gen_spirv_spec.zig
View File

@ -329,11 +329,7 @@ fn renderBitEnum(
try writer.print("_reserved_bit_{}", .{bitpos}); try writer.print("_reserved_bit_{}", .{bitpos});
} }
try writer.writeAll(": bool "); try writer.writeAll(": bool = false,\n");
if (bitpos == 0) { // Force alignment to integer boundaries
try writer.writeAll("align(@alignOf(u32)) ");
}
try writer.writeAll("= false,\n");
} }
try writer.writeByte('\n'); try writer.writeByte('\n');