Skip to content

Fix Zig 0.15 compatibility: Replace .C with .c calling convention #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apotema wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Zig 0.15 compatibility: Replace .C with .c calling convention #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/adapter.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub const RequestAdapterCallback = *const fn(
message: StringView,
userdata1: ?*anyopaque,
userdata2: ?*anyopaque,
) callconv(.C) void;
) callconv(.c) void;

pub const RequestAdapterResponse = struct {
status: RequestAdapterStatus,
Expand All @@ -119,7 +119,7 @@ pub const RequestAdapterResponse = struct {
};

pub const AdapterInfoProcs = struct {
pub const FreeMembers = *const fn(AdapterInfo) callconv(.C) void;
pub const FreeMembers = *const fn(AdapterInfo) callconv(.c) void;
};

extern fn wgpuAdapterInfoFreeMembers(adapter_info: AdapterInfo) void;
Expand All @@ -141,13 +141,13 @@ pub const AdapterInfo = extern struct {
};

pub const AdapterProcs = struct {
pub const GetFeatures = *const fn(*Adapter, *SupportedFeatures) callconv(.C) void;
pub const GetLimits = *const fn(*Adapter, *Limits) callconv(.C) Status;
pub const GetInfo = *const fn(*Adapter, *AdapterInfo) callconv(.C) Status;
pub const HasFeature = *const fn(*Adapter, FeatureName) callconv(.C) WGPUBool;
pub const RequestDevice = *const fn(*Adapter, ?*const DeviceDescriptor, RequestDeviceCallbackInfo) callconv(.C) Future;
pub const AddRef = *const fn(*Adapter) callconv(.C) void;
pub const Release = *const fn(*Adapter) callconv(.C) void;
pub const GetFeatures = *const fn(*Adapter, *SupportedFeatures) callconv(.c) void;
pub const GetLimits = *const fn(*Adapter, *Limits) callconv(.c) Status;
pub const GetInfo = *const fn(*Adapter, *AdapterInfo) callconv(.c) Status;
pub const HasFeature = *const fn(*Adapter, FeatureName) callconv(.c) WGPUBool;
pub const RequestDevice = *const fn(*Adapter, ?*const DeviceDescriptor, RequestDeviceCallbackInfo) callconv(.c) Future;
pub const AddRef = *const fn(*Adapter) callconv(.c) void;
pub const Release = *const fn(*Adapter) callconv(.c) void;
};

extern fn wgpuAdapterGetFeatures(adapter: *Adapter, features: *SupportedFeatures) void;
Expand All @@ -172,7 +172,7 @@ pub const Adapter = opaque{
return wgpuAdapterHasFeature(self, feature) != 0;
}

fn defaultDeviceCallback(status: RequestDeviceStatus, device: ?*Device, message: StringView, userdata1: ?*anyopaque, userdata2: ?*anyopaque) callconv(.C) void {
fn defaultDeviceCallback(status: RequestDeviceStatus, device: ?*Device, message: StringView, userdata1: ?*anyopaque, userdata2: ?*anyopaque) callconv(.c) void {
const ud_response: *RequestDeviceResponse = @ptrCast(@alignCast(userdata1));
ud_response.* = RequestDeviceResponse {
.status = status,
Expand Down
12 changes: 6 additions & 6 deletions src/bind_group.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ pub const BindGroupLayoutDescriptor = extern struct {
};

pub const BindGroupLayoutProcs = struct {
pub const SetLabel = *const fn(*BindGroupLayout, StringView) callconv(.C) void;
pub const AddRef = *const fn(*BindGroupLayout) callconv(.C) void;
pub const Release = *const fn(*BindGroupLayout) callconv(.C) void;
pub const SetLabel = *const fn(*BindGroupLayout, StringView) callconv(.c) void;
pub const AddRef = *const fn(*BindGroupLayout) callconv(.c) void;
pub const Release = *const fn(*BindGroupLayout) callconv(.c) void;
};

extern fn wgpuBindGroupLayoutSetLabel(bind_group_layout: *BindGroupLayout, label: StringView) void;
Expand Down Expand Up @@ -129,9 +129,9 @@ pub const BindGroupDescriptor = extern struct {
};

pub const BindGroupProcs = struct {
pub const SetLabel = *const fn(*BindGroup, StringView) callconv(.C) void;
pub const AddRef = *const fn(*BindGroup) callconv(.C) void;
pub const Release = *const fn(*BindGroup) callconv(.C) void;
pub const SetLabel = *const fn(*BindGroup, StringView) callconv(.c) void;
pub const AddRef = *const fn(*BindGroup) callconv(.c) void;
pub const Release = *const fn(*BindGroup) callconv(.c) void;
};

extern fn wgpuBindGroupSetLabel(bind_group: *BindGroup, label: StringView) void;
Expand Down
24 changes: 12 additions & 12 deletions src/buffer.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub const BufferMapCallbackInfo = extern struct {
userdata2: ?*anyopaque = null,
};

pub const BufferMapCallback = *const fn(status: MapAsyncStatus, message: StringView, userdata1: ?*anyopaque, userdata2: ?*anyopaque) callconv(.C) void;
pub const BufferMapCallback = *const fn(status: MapAsyncStatus, message: StringView, userdata1: ?*anyopaque, userdata2: ?*anyopaque) callconv(.c) void;

pub const BufferDescriptor = extern struct {
next_in_chain: ?*const ChainedStruct = null,
Expand All @@ -86,17 +86,17 @@ pub const BufferDescriptor = extern struct {
};

pub const BufferProcs = struct {
pub const Destroy = *const fn(*Buffer) callconv(.C) void;
pub const GetConstMappedRange = *const fn(*Buffer, usize, usize) callconv(.C) ?*const anyopaque;
pub const GetMapState = *const fn(*Buffer) callconv(.C) BufferMapState;
pub const GetMappedRange = *const fn(*Buffer, usize, usize) callconv(.C) ?*anyopaque;
pub const GetSize = *const fn(*Buffer) callconv(.C) u64;
pub const GetUsage = *const fn(*Buffer) callconv(.C) BufferUsage;
pub const MapAsync = *const fn(*Buffer, MapMode, usize, usize, BufferMapCallbackInfo) callconv(.C) Future;
pub const SetLabel = *const fn(*Buffer, StringView) callconv(.C) void;
pub const Unmap = *const fn(*Buffer) callconv(.C) void;
pub const AddRef = *const fn(*Buffer) callconv(.C) void;
pub const Release = *const fn(*Buffer) callconv(.C) void;
pub const Destroy = *const fn(*Buffer) callconv(.c) void;
pub const GetConstMappedRange = *const fn(*Buffer, usize, usize) callconv(.c) ?*const anyopaque;
pub const GetMapState = *const fn(*Buffer) callconv(.c) BufferMapState;
pub const GetMappedRange = *const fn(*Buffer, usize, usize) callconv(.c) ?*anyopaque;
pub const GetSize = *const fn(*Buffer) callconv(.c) u64;
pub const GetUsage = *const fn(*Buffer) callconv(.c) BufferUsage;
pub const MapAsync = *const fn(*Buffer, MapMode, usize, usize, BufferMapCallbackInfo) callconv(.c) Future;
pub const SetLabel = *const fn(*Buffer, StringView) callconv(.c) void;
pub const Unmap = *const fn(*Buffer) callconv(.c) void;
pub const AddRef = *const fn(*Buffer) callconv(.c) void;
pub const Release = *const fn(*Buffer) callconv(.c) void;
};

extern fn wgpuBufferDestroy(buffer: *Buffer) void;
Expand Down
128 changes: 64 additions & 64 deletions src/command_encoder.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ pub const CommandEncoderDescriptor = extern struct {
};

const ComputePassEncoderProcs = struct {
pub const DispatchWorkgroups = *const fn(*ComputePassEncoder, u32, u32, u32) callconv(.C) void;
pub const DispatchWorkgroupsIndirect = *const fn(*ComputePassEncoder, *Buffer, u64) callconv(.C) void;
pub const End = *const fn(*ComputePassEncoder) callconv(.C) void;
pub const InsertDebugMarker = *const fn(*ComputePassEncoder, StringView) callconv(.C) void;
pub const PopDebugGroup = *const fn(*ComputePassEncoder) callconv(.C) void;
pub const PushDebugGroup = *const fn(*ComputePassEncoder, StringView) callconv(.C) void;
pub const SetBindGroup = *const fn(*ComputePassEncoder, u32, *BindGroup, usize, ?[*]const u32) callconv(.C) void;
pub const SetLabel = *const fn(*ComputePassEncoder, StringView) callconv(.C) void;
pub const SetPipeline = *const fn(*ComputePassEncoder, *ComputePipeline) callconv(.C) void;
pub const AddRef = *const fn(*ComputePassEncoder) callconv(.C) void;
pub const Release = *const fn(*ComputePassEncoder) callconv(.C) void;
pub const DispatchWorkgroups = *const fn(*ComputePassEncoder, u32, u32, u32) callconv(.c) void;
pub const DispatchWorkgroupsIndirect = *const fn(*ComputePassEncoder, *Buffer, u64) callconv(.c) void;
pub const End = *const fn(*ComputePassEncoder) callconv(.c) void;
pub const InsertDebugMarker = *const fn(*ComputePassEncoder, StringView) callconv(.c) void;
pub const PopDebugGroup = *const fn(*ComputePassEncoder) callconv(.c) void;
pub const PushDebugGroup = *const fn(*ComputePassEncoder, StringView) callconv(.c) void;
pub const SetBindGroup = *const fn(*ComputePassEncoder, u32, *BindGroup, usize, ?[*]const u32) callconv(.c) void;
pub const SetLabel = *const fn(*ComputePassEncoder, StringView) callconv(.c) void;
pub const SetPipeline = *const fn(*ComputePassEncoder, *ComputePipeline) callconv(.c) void;
pub const AddRef = *const fn(*ComputePassEncoder) callconv(.c) void;
pub const Release = *const fn(*ComputePassEncoder) callconv(.c) void;

// wgpu-native procs?
// pub const SetPushConstants = *const fn(*ComputePassEncoder, u32, u32, *const anyopaque) callconv(.C) void;
// pub const BeginPipelineStatisticsQuery = *const fn(*ComputePassEncoder, *QuerySet, u32) callconv(.C) void;
// pub const EndPipelineStatisticsQuery = *const fn(*ComputePassEncoder) callconv(.C) void;
// pub const WriteTimestamp = *const fn(*ComputePassEncoder, *QuerySet, u32) callconv(.C) void;
// pub const SetPushConstants = *const fn(*ComputePassEncoder, u32, u32, *const anyopaque) callconv(.c) void;
// pub const BeginPipelineStatisticsQuery = *const fn(*ComputePassEncoder, *QuerySet, u32) callconv(.c) void;
// pub const EndPipelineStatisticsQuery = *const fn(*ComputePassEncoder) callconv(.c) void;
// pub const WriteTimestamp = *const fn(*ComputePassEncoder, *QuerySet, u32) callconv(.c) void;
};

extern fn wgpuComputePassEncoderDispatchWorkgroups(compute_pass_encoder: *ComputePassEncoder, workgroup_count_x: u32, workgroup_count_y: u32, workgroup_count_z: u32) void;
Expand Down Expand Up @@ -211,38 +211,38 @@ pub const RenderPassDescriptor = extern struct {
};

pub const RenderPassEncoderProcs = struct {
pub const BeginOcclusionQuery = *const fn(*RenderPassEncoder, u32) callconv(.C) void;
pub const Draw = *const fn(*RenderPassEncoder, u32, u32, u32, u32) callconv(.C) void;
pub const DrawIndexed = *const fn(*RenderPassEncoder, u32, u32, u32, i32, u32) callconv(.C) void;
pub const DrawIndexedIndirect = *const fn(*RenderPassEncoder, *Buffer, u64) callconv(.C) void;
pub const DrawIndirect = *const fn(*RenderPassEncoder, *Buffer, u64) callconv(.C) void;
pub const End = *const fn(*RenderPassEncoder) callconv(.C) void;
pub const EndOcclusionQuery = *const fn(*RenderPassEncoder) callconv(.C) void;
pub const ExecuteBundles = *const fn(*RenderPassEncoder, usize, [*]const *const RenderBundle) callconv(.C) void;
pub const InsertDebugMarker = *const fn(*RenderPassEncoder, StringView) callconv(.C) void;
pub const PopDebugGroup = *const fn(*RenderPassEncoder) callconv(.C) void;
pub const PushDebugGroup = *const fn(*RenderPassEncoder, StringView) callconv(.C) void;
pub const SetBindGroup = *const fn(*RenderPassEncoder, u32, *BindGroup, usize, ?[*]const u32) callconv(.C) void;
pub const SetBlendConstant = *const fn(*RenderPassEncoder, *const Color) callconv(.C) void;
pub const SetIndexBuffer = *const fn(*RenderPassEncoder, *Buffer, IndexFormat, u64, u64) callconv(.C) void;
pub const SetLabel = *const fn(*RenderPassEncoder, StringView) callconv(.C) void;
pub const SetPipeline = *const fn(*RenderPassEncoder, *RenderPipeline) callconv(.C) void;
pub const SetScissorRect = *const fn(*RenderPassEncoder, u32, u32, u32, u32) callconv(.C) void;
pub const SetStencilReference = *const fn(*RenderPassEncoder, u32) callconv(.C) void;
pub const SetVertexBuffer = *const fn(*RenderPassEncoder, u32, *Buffer, u64, u64) callconv(.C) void;
pub const SetViewport = *const fn(*RenderPassEncoder, f32, f32, f32, f32, f32, f32) callconv(.C) void;
pub const AddRef = *const fn(*RenderPassEncoder) callconv(.C) void;
pub const Release = *const fn(*RenderPassEncoder) callconv(.C) void;
pub const BeginOcclusionQuery = *const fn(*RenderPassEncoder, u32) callconv(.c) void;
pub const Draw = *const fn(*RenderPassEncoder, u32, u32, u32, u32) callconv(.c) void;
pub const DrawIndexed = *const fn(*RenderPassEncoder, u32, u32, u32, i32, u32) callconv(.c) void;
pub const DrawIndexedIndirect = *const fn(*RenderPassEncoder, *Buffer, u64) callconv(.c) void;
pub const DrawIndirect = *const fn(*RenderPassEncoder, *Buffer, u64) callconv(.c) void;
pub const End = *const fn(*RenderPassEncoder) callconv(.c) void;
pub const EndOcclusionQuery = *const fn(*RenderPassEncoder) callconv(.c) void;
pub const ExecuteBundles = *const fn(*RenderPassEncoder, usize, [*]const *const RenderBundle) callconv(.c) void;
pub const InsertDebugMarker = *const fn(*RenderPassEncoder, StringView) callconv(.c) void;
pub const PopDebugGroup = *const fn(*RenderPassEncoder) callconv(.c) void;
pub const PushDebugGroup = *const fn(*RenderPassEncoder, StringView) callconv(.c) void;
pub const SetBindGroup = *const fn(*RenderPassEncoder, u32, *BindGroup, usize, ?[*]const u32) callconv(.c) void;
pub const SetBlendConstant = *const fn(*RenderPassEncoder, *const Color) callconv(.c) void;
pub const SetIndexBuffer = *const fn(*RenderPassEncoder, *Buffer, IndexFormat, u64, u64) callconv(.c) void;
pub const SetLabel = *const fn(*RenderPassEncoder, StringView) callconv(.c) void;
pub const SetPipeline = *const fn(*RenderPassEncoder, *RenderPipeline) callconv(.c) void;
pub const SetScissorRect = *const fn(*RenderPassEncoder, u32, u32, u32, u32) callconv(.c) void;
pub const SetStencilReference = *const fn(*RenderPassEncoder, u32) callconv(.c) void;
pub const SetVertexBuffer = *const fn(*RenderPassEncoder, u32, *Buffer, u64, u64) callconv(.c) void;
pub const SetViewport = *const fn(*RenderPassEncoder, f32, f32, f32, f32, f32, f32) callconv(.c) void;
pub const AddRef = *const fn(*RenderPassEncoder) callconv(.c) void;
pub const Release = *const fn(*RenderPassEncoder) callconv(.c) void;

// wgpu-native procs?
// pub const SetPushConstants = *const fn(*RenderPassEncoder, ShaderStage, u32, u32, *const anyopaque) callconv(.C) void;
// pub const MultiDrawIndirect = *const fn(*RenderPassEncoder, *Buffer, u64, u32) callconv(.C) void;
// pub const MultiDrawIndexedIndirect = *const fn(*RenderPassEncoder, *Buffer, u64, u32) callconv(.C) void;
// pub const MultiDrawIndirectCount = *const fn(*RenderPassEncoder, *Buffer, u64, *Buffer, u64, u32) callconv(.C) void;
// pub const MultiDrawIndexedIndirectCount = *const fn(*RenderPassEncoder, *Buffer, u64, *Buffer, u64, u32) callconv(.C) void;
// pub const BeginPipelineStatisticsQuery = *const fn(*RenderPassEncoder, *QuerySet, u32) callconv(.C) void;
// pub const EndPipelineStatisticsQuery = *const fn(*RenderPassEncoder) callconv(.C) void;
// pub const WriteTimestamp = *const fn(*RenderPassEncoder, *QuerySet, u32) callconv(.C) void;
// pub const SetPushConstants = *const fn(*RenderPassEncoder, ShaderStage, u32, u32, *const anyopaque) callconv(.c) void;
// pub const MultiDrawIndirect = *const fn(*RenderPassEncoder, *Buffer, u64, u32) callconv(.c) void;
// pub const MultiDrawIndexedIndirect = *const fn(*RenderPassEncoder, *Buffer, u64, u32) callconv(.c) void;
// pub const MultiDrawIndirectCount = *const fn(*RenderPassEncoder, *Buffer, u64, *Buffer, u64, u32) callconv(.c) void;
// pub const MultiDrawIndexedIndirectCount = *const fn(*RenderPassEncoder, *Buffer, u64, *Buffer, u64, u32) callconv(.c) void;
// pub const BeginPipelineStatisticsQuery = *const fn(*RenderPassEncoder, *QuerySet, u32) callconv(.c) void;
// pub const EndPipelineStatisticsQuery = *const fn(*RenderPassEncoder) callconv(.c) void;
// pub const WriteTimestamp = *const fn(*RenderPassEncoder, *QuerySet, u32) callconv(.c) void;
};

extern fn wgpuRenderPassEncoderBeginOcclusionQuery(render_pass_encoder: *RenderPassEncoder, query_index: u32) void;
Expand Down Expand Up @@ -383,9 +383,9 @@ pub const CommandBufferDescriptor = extern struct {
};

pub const CommandBufferProcs = struct {
pub const SetLabel = *const fn(*CommandBuffer, StringView) callconv(.C) void;
pub const AddRef = *const fn(*CommandBuffer) callconv(.C) void;
pub const Release = *const fn(*CommandBuffer) callconv(.C) void;
pub const SetLabel = *const fn(*CommandBuffer, StringView) callconv(.c) void;
pub const AddRef = *const fn(*CommandBuffer) callconv(.c) void;
pub const Release = *const fn(*CommandBuffer) callconv(.c) void;
};

extern fn wgpuCommandBufferSetLabel(command_buffer: *CommandBuffer, label: StringView) void;
Expand All @@ -408,22 +408,22 @@ pub const CommandBuffer = opaque {
};

pub const CommandEncoderProcs = struct {
pub const BeginComputePass = *const fn(*CommandEncoder, ?*const ComputePassDescriptor) callconv(.C) ?*ComputePassEncoder;
pub const BeginRenderPass = *const fn(*CommandEncoder, *const RenderPassDescriptor) callconv(.C) ?*RenderPassEncoder;
pub const ClearBuffer = *const fn(*CommandEncoder, *Buffer, u64, u64) callconv(.C) void;
pub const CopyBufferToBuffer = *const fn(*CommandEncoder, *Buffer, u64, *Buffer, u64, u64) callconv(.C) void;
pub const CopyBufferToTexture = *const fn(*CommandEncoder, *const TexelCopyBufferInfo, *const TexelCopyTextureInfo, *const Extent3D) callconv(.C) void;
pub const CopyTextureToBuffer = *const fn(*CommandEncoder, *const TexelCopyTextureInfo, *const TexelCopyBufferInfo, *const Extent3D) callconv(.C) void;
pub const CopyTextureToTexture = *const fn(*CommandEncoder, *const TexelCopyTextureInfo, *const TexelCopyTextureInfo, *const Extent3D) callconv(.C) void;
pub const Finish = *const fn(*CommandEncoder, ?*const CommandBufferDescriptor) callconv(.C) ?*CommandBuffer;
pub const InsertDebugMarker = *const fn(*CommandEncoder, StringView) callconv(.C) void;
pub const PopDebugGroup = *const fn(*CommandEncoder) callconv(.C) void;
pub const PushDebugGroup = *const fn(*CommandEncoder, StringView) callconv(.C) void;
pub const ResolveQuerySet = *const fn(*CommandEncoder, *QuerySet, u32, u32, *Buffer, u64) callconv(.C) void;
pub const SetLabel = *const fn(*CommandEncoder, StringView) callconv(.C) void;
pub const WriteTimestamp = *const fn(*CommandEncoder, *QuerySet, u32) callconv(.C) void;
pub const AddRef = *const fn(*CommandEncoder) callconv(.C) void;
pub const Release = *const fn(*CommandEncoder) callconv(.C) void;
pub const BeginComputePass = *const fn(*CommandEncoder, ?*const ComputePassDescriptor) callconv(.c) ?*ComputePassEncoder;
pub const BeginRenderPass = *const fn(*CommandEncoder, *const RenderPassDescriptor) callconv(.c) ?*RenderPassEncoder;
pub const ClearBuffer = *const fn(*CommandEncoder, *Buffer, u64, u64) callconv(.c) void;
pub const CopyBufferToBuffer = *const fn(*CommandEncoder, *Buffer, u64, *Buffer, u64, u64) callconv(.c) void;
pub const CopyBufferToTexture = *const fn(*CommandEncoder, *const TexelCopyBufferInfo, *const TexelCopyTextureInfo, *const Extent3D) callconv(.c) void;
pub const CopyTextureToBuffer = *const fn(*CommandEncoder, *const TexelCopyTextureInfo, *const TexelCopyBufferInfo, *const Extent3D) callconv(.c) void;
pub const CopyTextureToTexture = *const fn(*CommandEncoder, *const TexelCopyTextureInfo, *const TexelCopyTextureInfo, *const Extent3D) callconv(.c) void;
pub const Finish = *const fn(*CommandEncoder, ?*const CommandBufferDescriptor) callconv(.c) ?*CommandBuffer;
pub const InsertDebugMarker = *const fn(*CommandEncoder, StringView) callconv(.c) void;
pub const PopDebugGroup = *const fn(*CommandEncoder) callconv(.c) void;
pub const PushDebugGroup = *const fn(*CommandEncoder, StringView) callconv(.c) void;
pub const ResolveQuerySet = *const fn(*CommandEncoder, *QuerySet, u32, u32, *Buffer, u64) callconv(.c) void;
pub const SetLabel = *const fn(*CommandEncoder, StringView) callconv(.c) void;
pub const WriteTimestamp = *const fn(*CommandEncoder, *QuerySet, u32) callconv(.c) void;
pub const AddRef = *const fn(*CommandEncoder) callconv(.c) void;
pub const Release = *const fn(*CommandEncoder) callconv(.c) void;
};

extern fn wgpuCommandEncoderBeginComputePass(command_encoder: *CommandEncoder, descriptor: ?*const ComputePassDescriptor) ?*ComputePassEncoder;
Expand Down
Loading