From fd948f4e8c0a026f5741d4735c7c444900bc5a04 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 16 Jul 2022 21:09:20 -0700 Subject: [PATCH] gpu: correct extern declarations Signed-off-by: Stephen Gutekanst --- gpu/src/command_buffer.zig | 2 +- gpu/src/command_encoder.zig | 2 +- gpu/src/dawn.zig | 4 ++-- gpu/src/main.zig | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gpu/src/command_buffer.zig b/gpu/src/command_buffer.zig index 23b5ac0c..90685a6e 100644 --- a/gpu/src/command_buffer.zig +++ b/gpu/src/command_buffer.zig @@ -6,7 +6,7 @@ pub const CommandBuffer = enum(usize) { // TODO: verify there is a use case for nullable value of this type. pub const none: CommandBuffer = @intToEnum(CommandBuffer, 0); - pub const Descriptor = struct { + pub const Descriptor = extern struct { next_in_chain: *const ChainedStruct, label: ?[*:0]const u8 = null, }; diff --git a/gpu/src/command_encoder.zig b/gpu/src/command_encoder.zig index 0fe51c85..28d35cb4 100644 --- a/gpu/src/command_encoder.zig +++ b/gpu/src/command_encoder.zig @@ -6,7 +6,7 @@ pub const CommandEncoder = enum(usize) { // TODO: verify there is a use case for nullable value of this type. pub const none: CommandEncoder = @intToEnum(CommandEncoder, 0); - pub const Descriptor = struct { + pub const Descriptor = extern struct { next_in_chain: *const ChainedStruct, label: ?[*:0]const u8 = null, }; diff --git a/gpu/src/dawn.zig b/gpu/src/dawn.zig index e8d0f0b4..745d6a55 100644 --- a/gpu/src/dawn.zig +++ b/gpu/src/dawn.zig @@ -1,13 +1,13 @@ const ChainedStruct = @import("types.zig").ChainedStruct; const Texture = @import("texture.zig").Texture; -pub const CacheDeviceDescriptor = struct { +pub const CacheDeviceDescriptor = extern struct { // TODO: file an issue on Dawn: why not named nextInChain? chain: ChainedStruct, isolation_key: [*:0]const u8, }; -pub const EncoderInternalUsageDescriptor = struct { +pub const EncoderInternalUsageDescriptor = extern struct { // TODO: file an issue on Dawn: why not named nextInChain? chain: ChainedStruct, use_internal_usages: bool, diff --git a/gpu/src/main.zig b/gpu/src/main.zig index d87f98a7..3f810026 100644 --- a/gpu/src/main.zig +++ b/gpu/src/main.zig @@ -46,7 +46,7 @@ pub const RenderPassTimestampLocation = @import("types.zig").RenderPassTimestamp pub const PowerPreference = @import("types.zig").PowerPreference; pub const RenderPassColorAttachment = @import("types.zig").RenderPassColorAttachment; -pub const ComputePassTimestampWrite = struct { +pub const ComputePassTimestampWrite = extern struct { query_set: QuerySet, query_index: u32, location: ComputePassTimestampLocation,