Skip to content

Commit

Permalink
Update sokol-zig for zig devel
Browse files Browse the repository at this point in the history
  • Loading branch information
@nurpax
nurpax committed Jul 1, 2023
1 parent f0a04f4 commit cc5e8b0
Show file tree
Hide file tree
Showing 14 changed files with 1,964 additions and 2,137 deletions.
49 changes: 22 additions & 27 deletions sokol/app.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const builtin = @import("builtin");

// helper function to convert a C string to a Zig string slice
fn cStrToZig(c_str: [*c]const u8) [:0]const u8 {
return @import("std").mem.span(c_str);
return @import("std").mem.span(c_str);
}
pub const max_touchpoints = 8;
pub const max_mousebuttons = 3;
Expand Down Expand Up @@ -214,15 +214,15 @@ pub const Range = extern struct {
pub const ImageDesc = extern struct {
width: i32 = 0,
height: i32 = 0,
pixels: Range = .{ },
pixels: Range = .{},
};
pub const IconDesc = extern struct {
sokol_default: bool = false,
images: [8]ImageDesc = [_]ImageDesc{.{}} ** 8,
};
pub const Allocator = extern struct {
alloc: ?*const fn(usize, ?*anyopaque) callconv(.C) ?*anyopaque = null,
free: ?*const fn(?*anyopaque, ?*anyopaque) callconv(.C) void = null,
alloc: ?*const fn (usize, ?*anyopaque) callconv(.C) ?*anyopaque = null,
free: ?*const fn (?*anyopaque, ?*anyopaque) callconv(.C) void = null,
user_data: ?*anyopaque = null,
};
pub const LogItem = enum(i32) {
Expand Down Expand Up @@ -314,19 +314,19 @@ pub const LogItem = enum(i32) {
CLIPBOARD_STRING_TOO_BIG,
};
pub const Logger = extern struct {
func: ?*const fn([*c]const u8, u32, u32, [*c]const u8, u32, [*c]const u8, ?*anyopaque) callconv(.C) void = null,
func: ?*const fn ([*c]const u8, u32, u32, [*c]const u8, u32, [*c]const u8, ?*anyopaque) callconv(.C) void = null,
user_data: ?*anyopaque = null,
};
pub const Desc = extern struct {
init_cb: ?*const fn() callconv(.C) void = null,
frame_cb: ?*const fn() callconv(.C) void = null,
cleanup_cb: ?*const fn() callconv(.C) void = null,
event_cb: ?*const fn([*c]const Event) callconv(.C) void = null,
init_cb: ?*const fn () callconv(.C) void = null,
frame_cb: ?*const fn () callconv(.C) void = null,
cleanup_cb: ?*const fn () callconv(.C) void = null,
event_cb: ?*const fn ([*c]const Event) callconv(.C) void = null,
user_data: ?*anyopaque = null,
init_userdata_cb: ?*const fn(?*anyopaque) callconv(.C) void = null,
frame_userdata_cb: ?*const fn(?*anyopaque) callconv(.C) void = null,
cleanup_userdata_cb: ?*const fn(?*anyopaque) callconv(.C) void = null,
event_userdata_cb: ?*const fn([*c]const Event, ?*anyopaque) callconv(.C) void = null,
init_userdata_cb: ?*const fn (?*anyopaque) callconv(.C) void = null,
frame_userdata_cb: ?*const fn (?*anyopaque) callconv(.C) void = null,
cleanup_userdata_cb: ?*const fn (?*anyopaque) callconv(.C) void = null,
event_userdata_cb: ?*const fn ([*c]const Event, ?*anyopaque) callconv(.C) void = null,
width: i32 = 0,
height: i32 = 0,
sample_count: i32 = 0,
Expand All @@ -340,10 +340,9 @@ pub const Desc = extern struct {
enable_dragndrop: bool = false,
max_dropped_files: i32 = 0,
max_dropped_file_path_length: i32 = 0,
icon: IconDesc = .{ },
allocator: Allocator = .{ },
logger: Logger = .{ },
gl_force_gles2: bool = false,
icon: IconDesc = .{},
allocator: Allocator = .{},
logger: Logger = .{},
gl_major_version: i32 = 0,
gl_minor_version: i32 = 0,
win32_console_utf8: bool = false,
Expand All @@ -365,14 +364,14 @@ pub const Html5FetchResponse = extern struct {
succeeded: bool = false,
error_code: Html5FetchError = .FETCH_ERROR_NO_ERROR,
file_index: i32 = 0,
data: Range = .{ },
buffer: Range = .{ },
data: Range = .{},
buffer: Range = .{},
user_data: ?*anyopaque = null,
};
pub const Html5FetchRequest = extern struct {
dropped_file_index: i32 = 0,
callback: ?*const fn([*c]const Html5FetchResponse) callconv(.C) void = null,
buffer: Range = .{ },
callback: ?*const fn ([*c]const Html5FetchResponse) callconv(.C) void = null,
buffer: Range = .{},
user_data: ?*anyopaque = null,
};
pub const MouseCursor = enum(i32) {
Expand Down Expand Up @@ -503,15 +502,15 @@ pub fn frameDuration() f64 {
}
pub extern fn sapp_set_clipboard_string([*c]const u8) void;
pub fn setClipboardString(str: [:0]const u8) void {
sapp_set_clipboard_string(@ptrCast([*c]const u8,str));
sapp_set_clipboard_string(@ptrCast(str));
}
pub extern fn sapp_get_clipboard_string() [*c]const u8;
pub fn getClipboardString() [:0]const u8 {
return cStrToZig(sapp_get_clipboard_string());
}
pub extern fn sapp_set_window_title([*c]const u8) void;
pub fn setWindowTitle(str: [:0]const u8) void {
sapp_set_window_title(@ptrCast([*c]const u8,str));
sapp_set_window_title(@ptrCast(str));
}
pub extern fn sapp_set_icon([*c]const IconDesc) void;
pub fn setIcon(icon_desc: IconDesc) void {
Expand All @@ -537,10 +536,6 @@ pub extern fn sapp_egl_get_context() ?*const anyopaque;
pub fn eglGetContext() ?*const anyopaque {
return sapp_egl_get_context();
}
pub extern fn sapp_gles2() bool;
pub fn gles2() bool {
return sapp_gles2();
}
pub extern fn sapp_html5_ask_leave_site(bool) void;
pub fn html5AskLeaveSite(ask: bool) void {
sapp_html5_ask_leave_site(ask);
Expand Down
14 changes: 4 additions & 10 deletions sokol/app_gfx_glue.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ const sg = @import("gfx.zig");
const sapp = @import("app.zig");

pub fn context() sg.ContextDesc {
return sg.ContextDesc {
return sg.ContextDesc{
.color_format = sapp.colorFormat(),
.depth_format = sapp.depthFormat(),
.sample_count = sapp.sampleCount(),
.gl = .{
.force_gles2 = sapp.gles2(),
},
.metal = .{
.device = sapp.sapp_metal_get_device(),
.renderpass_descriptor_cb = sapp.sapp_metal_get_renderpass_descriptor,
Expand All @@ -18,16 +15,13 @@ pub fn context() sg.ContextDesc {
.device = sapp.sapp_d3d11_get_device(),
.device_context = sapp.sapp_d3d11_get_device_context(),
.render_target_view_cb = sapp.sapp_d3d11_get_render_target_view,
.depth_stencil_view_cb = sapp.sapp_d3d11_get_depth_stencil_view
.depth_stencil_view_cb = sapp.sapp_d3d11_get_depth_stencil_view,
},
.wgpu = .{
.device = sapp.sapp_wgpu_get_device(),
.render_view_cb = sapp.sapp_wgpu_get_render_view,
.resolve_view_cb = sapp.sapp_wgpu_get_resolve_view,
.depth_stencil_view_cb = sapp.sapp_wgpu_get_depth_stencil_view
}
.depth_stencil_view_cb = sapp.sapp_wgpu_get_depth_stencil_view,
},
};
}



16 changes: 8 additions & 8 deletions sokol/audio.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const builtin = @import("builtin");

// helper function to convert a C string to a Zig string slice
fn cStrToZig(c_str: [*c]const u8) [:0]const u8 {
return @import("std").mem.span(c_str);
return @import("std").mem.span(c_str);
}
pub const LogItem = enum(i32) {
OK,
Expand Down Expand Up @@ -45,12 +45,12 @@ pub const LogItem = enum(i32) {
BACKEND_BUFFER_SIZE_ISNT_MULTIPLE_OF_PACKET_SIZE,
};
pub const Logger = extern struct {
func: ?*const fn([*c]const u8, u32, u32, [*c]const u8, u32, [*c]const u8, ?*anyopaque) callconv(.C) void = null,
func: ?*const fn ([*c]const u8, u32, u32, [*c]const u8, u32, [*c]const u8, ?*anyopaque) callconv(.C) void = null,
user_data: ?*anyopaque = null,
};
pub const Allocator = extern struct {
alloc: ?*const fn(usize, ?*anyopaque) callconv(.C) ?*anyopaque = null,
free: ?*const fn(?*anyopaque, ?*anyopaque) callconv(.C) void = null,
alloc: ?*const fn (usize, ?*anyopaque) callconv(.C) ?*anyopaque = null,
free: ?*const fn (?*anyopaque, ?*anyopaque) callconv(.C) void = null,
user_data: ?*anyopaque = null,
};
pub const Desc = extern struct {
Expand All @@ -59,11 +59,11 @@ pub const Desc = extern struct {
buffer_frames: i32 = 0,
packet_frames: i32 = 0,
num_packets: i32 = 0,
stream_cb: ?*const fn([*c] f32, i32, i32) callconv(.C) void = null,
stream_userdata_cb: ?*const fn([*c] f32, i32, i32, ?*anyopaque) callconv(.C) void = null,
stream_cb: ?*const fn ([*c]f32, i32, i32) callconv(.C) void = null,
stream_userdata_cb: ?*const fn ([*c]f32, i32, i32, ?*anyopaque) callconv(.C) void = null,
user_data: ?*anyopaque = null,
allocator: Allocator = .{ },
logger: Logger = .{ },
allocator: Allocator = .{},
logger: Logger = .{},
};
pub extern fn saudio_setup([*c]const Desc) void;
pub fn setup(desc: Desc) void {
Expand Down
Loading

0 comments on commit cc5e8b0

Please sign in to comment.