From 8462427524a8110defc6c11e12ab1e5598f249ef Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 16 Aug 2022 20:45:24 -0700 Subject: [PATCH] gpu: add type-safety for chaining dawn.TextureInternalUsageDescriptor Signed-off-by: Stephen Gutekanst --- gpu/src/dawn.zig | 1 - gpu/src/texture.zig | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gpu/src/dawn.zig b/gpu/src/dawn.zig index 06538acd..e858e201 100644 --- a/gpu/src/dawn.zig +++ b/gpu/src/dawn.zig @@ -32,7 +32,6 @@ pub const InstanceDescriptor = extern struct { } }; -/// TODO: Can be chained in gpu.Texture.Descriptor pub const TextureInternalUsageDescriptor = extern struct { chain: ChainedStruct = .{ .next = null, .s_type = .dawn_texture_internal_usage_descriptor }, internal_usage: Texture.UsageFlags = Texture.UsageFlags.none, diff --git a/gpu/src/texture.zig b/gpu/src/texture.zig index 1072adcd..280a5940 100644 --- a/gpu/src/texture.zig +++ b/gpu/src/texture.zig @@ -4,6 +4,7 @@ const TextureView = @import("texture_view.zig").TextureView; const Extent3D = @import("types.zig").Extent3D; const Impl = @import("interface.zig").Impl; const types = @import("types.zig"); +const dawn = @import("dawn.zig"); pub const Texture = opaque { pub const Aspect = enum(u32) { @@ -174,7 +175,12 @@ pub const Texture = opaque { }; pub const Descriptor = extern struct { - next_in_chain: ?*const ChainedStruct = null, + pub const NextInChain = extern union { + generic: ?*const ChainedStruct, + dawn_texture_internal_usage_descriptor: *const dawn.TextureInternalUsageDescriptor, + }; + + next_in_chain: NextInChain = .{ .generic = null }, label: ?[*:0]const u8 = null, usage: UsageFlags, dimension: Dimension = .dimension_2d, @@ -187,7 +193,7 @@ pub const Texture = opaque { /// Provides a slightly friendlier Zig API to initialize this structure. pub inline fn init(v: struct { - next_in_chain: ?*const ChainedStruct = null, + next_in_chain: NextInChain = .{ .generic = null }, label: ?[*:0]const u8 = null, usage: UsageFlags, dimension: Dimension = .dimension_2d,