falsepattern/zig-glfw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glfw: pretranslate @cImport to workaround self-hosted compiler bug

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-08-20 10:34:01 -07:00
parent eaf60a33d2
commit 569dd4b8d9
4 changed files with 80991 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/c.zig
View file

@ -1,21 +1,11 @@
//! The GLFW C import pub const c = if (@import("builtin").zig_backend == .stage1)
//! @cImport({
//! This is declared centrally in this module and imported in all usage locations, as otherwise
//! the underlying C import would be generated multiple times and e.g. struct types would be
//! incompatible, e.g.:
//!
//! ```
//! ./src/Monitor.zig:207:46: error: expected type '.cimport:8:11.struct_GLFWvidmode', found '.cimport:6:11.struct_GLFWvidmode'
//! slice[i] = VideoMode{ .handle = modes[i] };
//! ^
//! ./zig-cache/o/07cfe6253b7dceb60e4bf24e3426d444/cimport.zig:783:32: note: .cimport:8:11.struct_GLFWvidmode declared here
//! pub const struct_GLFWvidmode = extern struct {
//! ^
//! ./zig-cache/o/07cfe6253b7dceb60e4bf24e3426d444/cimport.zig:783:32: note: .cimport:6:11.struct_GLFWvidmode declared here
//! pub const struct_GLFWvidmode = extern struct {
//! ^
//! ```
pub const c = @cImport({
@cDefine("GLFW_INCLUDE_VULKAN", "1"); @cDefine("GLFW_INCLUDE_VULKAN", "1");
@cInclude("GLFW/glfw3.h"); @cInclude("GLFW/glfw3.h");
}); })
else
// HACK: workaround https://github.com/ziglang/zig/issues/12483
//
// Extracted from a build using stage1 from zig-cache/ (`cimport.zig`)
// Then find+replace `= ?fn` -> `= ?*const fn`
@import("cimport2.zig");

65914
src/cimport1.zig Normal file
View file

File diff suppressed because it is too large Load diff

15045
src/cimport2.zig Normal file
View file

File diff suppressed because it is too large Load diff

11
src/native.zig
View file

@ -40,7 +40,8 @@ pub const BackendOptions = struct {
/// The chosen backends must match those the library was compiled for. Failure to do so /// The chosen backends must match those the library was compiled for. Failure to do so
/// will cause a link-time error. /// will cause a link-time error.
pub fn Native(comptime options: BackendOptions) type { pub fn Native(comptime options: BackendOptions) type {
const native = @cImport({ const native = if (@import("builtin").zig_backend == .stage1)
@cImport({
@cDefine("GLFW_INCLUDE_VULKAN", "1"); @cDefine("GLFW_INCLUDE_VULKAN", "1");
@cInclude("GLFW/glfw3.h"); @cInclude("GLFW/glfw3.h");
@ -54,7 +55,13 @@ pub fn Native(comptime options: BackendOptions) type {
if (options.egl) @cDefine("GLFW_EXPOSE_NATIVE_EGL", "1"); if (options.egl) @cDefine("GLFW_EXPOSE_NATIVE_EGL", "1");
if (options.osmesa) @cDefine("GLFW_EXPOSE_NATIVE_OSMESA", "1"); if (options.osmesa) @cDefine("GLFW_EXPOSE_NATIVE_OSMESA", "1");
@cInclude("GLFW/glfw3native.h"); @cInclude("GLFW/glfw3native.h");
}); })
else
// HACK: workaround https://github.com/ziglang/zig/issues/12483
//
// Extracted from a build using stage1 from zig-cache/ (`cimport.zig`)
// Then find+replace `= ?fn` -> `= ?*const fn`
@import("cimport1.zig");
return struct { return struct {
/// Returns the adapter device name of the specified monitor. /// Returns the adapter device name of the specified monitor.