From ce747b7fdc33f8b64c9140814e01c38fd9b92693 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:14:10 -0700 Subject: [PATCH 1/6] glfw: rm -rf webgpu/ Signed-off-by: Stephen Gutekanst --- webgpu/README.md | 16 ---------------- webgpu/build.zig | 14 -------------- webgpu/src/main.zig | 10 ---------- 3 files changed, 40 deletions(-) delete mode 100644 webgpu/README.md delete mode 100644 webgpu/build.zig delete mode 100644 webgpu/src/main.zig diff --git a/webgpu/README.md b/webgpu/README.md deleted file mode 100644 index e2e18eaf..00000000 --- a/webgpu/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# WebGPU for Zig Hexops logo - -Idiomatic [Zig](https://ziglang.org) bindings to [WebGPU](https://gpuweb.github.io/gpuweb), the up-and-coming API which allows for unified access to low-level graphics APIs like Vulkan, Metal, and D3D12 across web, desktop, and mobile devices. - -This library is _truly cross platform_, allowing you to use the same graphics API **in the web** or **natively** (desktop & mobile): - -- **WebAssembly targets**: Uses the browser's provided WebGPU API. -- **Native targets:** supports multiple WebGPU backend implementations: - - [Dawn](https://dawn.googlesource.com/dawn), Chrome's C++ implementation of WebGPU. - - [gfx-rs/wgpu-native](https://github.com/gfx-rs/wgpu-native), the Rust implementation of WebGPU. - -## webgpu.h version - -Both [Dawn](https://dawn.googlesource.com/dawn) and [gfx-rs/wgpu-native](https://github.com/gfx-rs/wgpu-native) implement a shared common C header, [webgpu.h](https://github.com/webgpu-native/webgpu-headers) which maps 1:1 with the WebGPU IDL specification. - -You can find the version of `webgpu.h` currently targeted by this library [here](https://github.com/webgpu-native/webgpu-headers/tree/c8e0b39f6f6f1edded5c4adf7d46aa4d2a95befe). diff --git a/webgpu/build.zig b/webgpu/build.zig deleted file mode 100644 index 8d295ab9..00000000 --- a/webgpu/build.zig +++ /dev/null @@ -1,14 +0,0 @@ -const Builder = @import("std").build.Builder; - -pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const lib = b.addStaticLibrary("webgpu", "src/main.zig"); - lib.setBuildMode(mode); - lib.install(); - - var main_tests = b.addTest("src/main.zig"); - main_tests.setBuildMode(mode); - - const test_step = b.step("test", "Run library tests"); - test_step.dependOn(&main_tests.step); -} diff --git a/webgpu/src/main.zig b/webgpu/src/main.zig deleted file mode 100644 index ecfeade1..00000000 --- a/webgpu/src/main.zig +++ /dev/null @@ -1,10 +0,0 @@ -const std = @import("std"); -const testing = std.testing; - -export fn add(a: i32, b: i32) i32 { - return a + b; -} - -test "basic add functionality" { - try testing.expect(add(3, 7) == 10); -} From 3d71f9959fb6a451381a36d7506ac8c538e7141d Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:15:08 -0700 Subject: [PATCH 2/6] glfw: split into its own repo Signed-off-by: Stephen Gutekanst --- build.zig | 23 ----------------------- src/main.zig | 8 -------- 2 files changed, 31 deletions(-) delete mode 100644 build.zig delete mode 100644 src/main.zig diff --git a/build.zig b/build.zig deleted file mode 100644 index d3a30ec1..00000000 --- a/build.zig +++ /dev/null @@ -1,23 +0,0 @@ -const Builder = @import("std").build.Builder; -const glfw = @import("glfw/build.zig"); - -pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const target = b.standardTargetOptions(.{}); - - const lib = b.addStaticLibrary("engine", "src/main.zig"); - lib.setBuildMode(mode); - lib.setTarget(target); - lib.addPackagePath("glfw", "glfw/src/main.zig"); - glfw.link(b, lib, .{}); - lib.install(); - - var main_tests = b.addTest("src/main.zig"); - main_tests.setBuildMode(mode); - main_tests.setTarget(target); - main_tests.addPackagePath("glfw", "glfw/src/main.zig"); - glfw.link(b, main_tests, .{}); - - const test_step = b.step("test", "Run library tests"); - test_step.dependOn(&main_tests.step); -} diff --git a/src/main.zig b/src/main.zig deleted file mode 100644 index 728ff2e2..00000000 --- a/src/main.zig +++ /dev/null @@ -1,8 +0,0 @@ -const std = @import("std"); -const testing = std.testing; - -const glfw = @import("glfw"); - -test "glfw_basic" { - glfw.basicTest() catch unreachable; -} From 453b763ebd2b2f90e71bdb29b674218578b67dd2 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:18:15 -0700 Subject: [PATCH 3/6] glfw: mv glfw/* . Signed-off-by: Stephen Gutekanst --- glfw/build.zig => build.zig | 0 {glfw/src => src}/Cursor.zig | 0 {glfw/src => src}/GammaRamp.zig | 0 {glfw/src => src}/Image.zig | 0 {glfw/src => src}/Joystick.zig | 0 {glfw/src => src}/Monitor.zig | 0 {glfw/src => src}/VideoMode.zig | 0 {glfw/src => src}/Window.zig | 0 {glfw/src => src}/action.zig | 0 {glfw/src => src}/c.zig | 0 {glfw/src => src}/clipboard.zig | 0 {glfw/src => src}/consts.zig | 0 {glfw/src => src}/errors.zig | 0 {glfw/src => src}/gamepad_axis.zig | 0 {glfw/src => src}/gamepad_button.zig | 0 {glfw/src => src}/hat.zig | 0 {glfw/src => src}/key.zig | 0 {glfw/src => src}/main.zig | 0 {glfw/src => src}/mod.zig | 0 {glfw/src => src}/mouse_button.zig | 0 {glfw/src => src}/opengl.zig | 0 {glfw/src => src}/time.zig | 0 {glfw/src => src}/version.zig | 0 {glfw/src => src}/vulkan.zig | 0 glfw/update-upstream.sh => update-upstream.sh | 0 {glfw/upstream => upstream}/glfw/LICENSE.md | 0 {glfw/upstream => upstream}/glfw/include/GLFW/glfw3.h | 0 {glfw/upstream => upstream}/glfw/include/GLFW/glfw3native.h | 0 {glfw/upstream => upstream}/glfw/src/cocoa_init.m | 0 {glfw/upstream => upstream}/glfw/src/cocoa_joystick.h | 0 {glfw/upstream => upstream}/glfw/src/cocoa_joystick.m | 0 {glfw/upstream => upstream}/glfw/src/cocoa_monitor.m | 0 {glfw/upstream => upstream}/glfw/src/cocoa_platform.h | 0 {glfw/upstream => upstream}/glfw/src/cocoa_time.c | 0 {glfw/upstream => upstream}/glfw/src/cocoa_window.m | 0 {glfw/upstream => upstream}/glfw/src/context.c | 0 {glfw/upstream => upstream}/glfw/src/egl_context.c | 0 {glfw/upstream => upstream}/glfw/src/egl_context.h | 0 {glfw/upstream => upstream}/glfw/src/glx_context.c | 0 {glfw/upstream => upstream}/glfw/src/glx_context.h | 0 {glfw/upstream => upstream}/glfw/src/init.c | 0 {glfw/upstream => upstream}/glfw/src/input.c | 0 {glfw/upstream => upstream}/glfw/src/internal.h | 0 {glfw/upstream => upstream}/glfw/src/linux_joystick.c | 0 {glfw/upstream => upstream}/glfw/src/linux_joystick.h | 0 {glfw/upstream => upstream}/glfw/src/mappings.h | 0 {glfw/upstream => upstream}/glfw/src/monitor.c | 0 {glfw/upstream => upstream}/glfw/src/nsgl_context.h | 0 {glfw/upstream => upstream}/glfw/src/nsgl_context.m | 0 {glfw/upstream => upstream}/glfw/src/null_init.c | 0 {glfw/upstream => upstream}/glfw/src/null_joystick.c | 0 {glfw/upstream => upstream}/glfw/src/null_joystick.h | 0 {glfw/upstream => upstream}/glfw/src/null_monitor.c | 0 {glfw/upstream => upstream}/glfw/src/null_platform.h | 0 {glfw/upstream => upstream}/glfw/src/null_window.c | 0 {glfw/upstream => upstream}/glfw/src/osmesa_context.c | 0 {glfw/upstream => upstream}/glfw/src/osmesa_context.h | 0 {glfw/upstream => upstream}/glfw/src/posix_thread.c | 0 {glfw/upstream => upstream}/glfw/src/posix_thread.h | 0 {glfw/upstream => upstream}/glfw/src/posix_time.c | 0 {glfw/upstream => upstream}/glfw/src/posix_time.h | 0 {glfw/upstream => upstream}/glfw/src/vulkan.c | 0 {glfw/upstream => upstream}/glfw/src/wgl_context.c | 0 {glfw/upstream => upstream}/glfw/src/wgl_context.h | 0 {glfw/upstream => upstream}/glfw/src/win32_init.c | 0 {glfw/upstream => upstream}/glfw/src/win32_joystick.c | 0 {glfw/upstream => upstream}/glfw/src/win32_joystick.h | 0 {glfw/upstream => upstream}/glfw/src/win32_monitor.c | 0 {glfw/upstream => upstream}/glfw/src/win32_platform.h | 0 {glfw/upstream => upstream}/glfw/src/win32_thread.c | 0 {glfw/upstream => upstream}/glfw/src/win32_time.c | 0 {glfw/upstream => upstream}/glfw/src/win32_window.c | 0 {glfw/upstream => upstream}/glfw/src/window.c | 0 {glfw/upstream => upstream}/glfw/src/wl_init.c | 0 {glfw/upstream => upstream}/glfw/src/wl_monitor.c | 0 {glfw/upstream => upstream}/glfw/src/wl_platform.h | 0 {glfw/upstream => upstream}/glfw/src/wl_window.c | 0 {glfw/upstream => upstream}/glfw/src/x11_init.c | 0 {glfw/upstream => upstream}/glfw/src/x11_monitor.c | 0 {glfw/upstream => upstream}/glfw/src/x11_platform.h | 0 {glfw/upstream => upstream}/glfw/src/x11_window.c | 0 {glfw/upstream => upstream}/glfw/src/xkb_unicode.c | 0 {glfw/upstream => upstream}/glfw/src/xkb_unicode.h | 0 {glfw/upstream => upstream}/vulkan_headers/.cmake-format.py | 0 {glfw/upstream => upstream}/vulkan_headers/.gitattributes | 0 {glfw/upstream => upstream}/vulkan_headers/.gitignore | 0 .../upstream => upstream}/vulkan_headers/include/vulkan/vk_icd.h | 0 .../vulkan_headers/include/vulkan/vk_layer.h | 0 .../vulkan_headers/include/vulkan/vk_platform.h | 0 .../vulkan_headers/include/vulkan/vk_sdk_platform.h | 0 .../upstream => upstream}/vulkan_headers/include/vulkan/vulkan.h | 0 .../vulkan_headers/include/vulkan/vulkan.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_android.h | 0 .../vulkan_headers/include/vulkan/vulkan_beta.h | 0 .../vulkan_headers/include/vulkan/vulkan_core.h | 0 .../vulkan_headers/include/vulkan/vulkan_directfb.h | 0 .../vulkan_headers/include/vulkan/vulkan_enums.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_fuchsia.h | 0 .../vulkan_headers/include/vulkan/vulkan_funcs.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_ggp.h | 0 .../vulkan_headers/include/vulkan/vulkan_handles.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_ios.h | 0 .../vulkan_headers/include/vulkan/vulkan_macos.h | 0 .../vulkan_headers/include/vulkan/vulkan_metal.h | 0 .../vulkan_headers/include/vulkan/vulkan_raii.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_screen.h | 0 .../vulkan_headers/include/vulkan/vulkan_structs.hpp | 0 .../vulkan_headers/include/vulkan/vulkan_vi.h | 0 .../vulkan_headers/include/vulkan/vulkan_wayland.h | 0 .../vulkan_headers/include/vulkan/vulkan_win32.h | 0 .../vulkan_headers/include/vulkan/vulkan_xcb.h | 0 .../vulkan_headers/include/vulkan/vulkan_xlib.h | 0 .../vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h | 0 113 files changed, 0 insertions(+), 0 deletions(-) rename glfw/build.zig => build.zig (100%) rename {glfw/src => src}/Cursor.zig (100%) rename {glfw/src => src}/GammaRamp.zig (100%) rename {glfw/src => src}/Image.zig (100%) rename {glfw/src => src}/Joystick.zig (100%) rename {glfw/src => src}/Monitor.zig (100%) rename {glfw/src => src}/VideoMode.zig (100%) rename {glfw/src => src}/Window.zig (100%) rename {glfw/src => src}/action.zig (100%) rename {glfw/src => src}/c.zig (100%) rename {glfw/src => src}/clipboard.zig (100%) rename {glfw/src => src}/consts.zig (100%) rename {glfw/src => src}/errors.zig (100%) rename {glfw/src => src}/gamepad_axis.zig (100%) rename {glfw/src => src}/gamepad_button.zig (100%) rename {glfw/src => src}/hat.zig (100%) rename {glfw/src => src}/key.zig (100%) rename {glfw/src => src}/main.zig (100%) rename {glfw/src => src}/mod.zig (100%) rename {glfw/src => src}/mouse_button.zig (100%) rename {glfw/src => src}/opengl.zig (100%) rename {glfw/src => src}/time.zig (100%) rename {glfw/src => src}/version.zig (100%) rename {glfw/src => src}/vulkan.zig (100%) rename glfw/update-upstream.sh => update-upstream.sh (100%) rename {glfw/upstream => upstream}/glfw/LICENSE.md (100%) rename {glfw/upstream => upstream}/glfw/include/GLFW/glfw3.h (100%) rename {glfw/upstream => upstream}/glfw/include/GLFW/glfw3native.h (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_init.m (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_joystick.h (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_joystick.m (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_monitor.m (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_platform.h (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_time.c (100%) rename {glfw/upstream => upstream}/glfw/src/cocoa_window.m (100%) rename {glfw/upstream => upstream}/glfw/src/context.c (100%) rename {glfw/upstream => upstream}/glfw/src/egl_context.c (100%) rename {glfw/upstream => upstream}/glfw/src/egl_context.h (100%) rename {glfw/upstream => upstream}/glfw/src/glx_context.c (100%) rename {glfw/upstream => upstream}/glfw/src/glx_context.h (100%) rename {glfw/upstream => upstream}/glfw/src/init.c (100%) rename {glfw/upstream => upstream}/glfw/src/input.c (100%) rename {glfw/upstream => upstream}/glfw/src/internal.h (100%) rename {glfw/upstream => upstream}/glfw/src/linux_joystick.c (100%) rename {glfw/upstream => upstream}/glfw/src/linux_joystick.h (100%) rename {glfw/upstream => upstream}/glfw/src/mappings.h (100%) rename {glfw/upstream => upstream}/glfw/src/monitor.c (100%) rename {glfw/upstream => upstream}/glfw/src/nsgl_context.h (100%) rename {glfw/upstream => upstream}/glfw/src/nsgl_context.m (100%) rename {glfw/upstream => upstream}/glfw/src/null_init.c (100%) rename {glfw/upstream => upstream}/glfw/src/null_joystick.c (100%) rename {glfw/upstream => upstream}/glfw/src/null_joystick.h (100%) rename {glfw/upstream => upstream}/glfw/src/null_monitor.c (100%) rename {glfw/upstream => upstream}/glfw/src/null_platform.h (100%) rename {glfw/upstream => upstream}/glfw/src/null_window.c (100%) rename {glfw/upstream => upstream}/glfw/src/osmesa_context.c (100%) rename {glfw/upstream => upstream}/glfw/src/osmesa_context.h (100%) rename {glfw/upstream => upstream}/glfw/src/posix_thread.c (100%) rename {glfw/upstream => upstream}/glfw/src/posix_thread.h (100%) rename {glfw/upstream => upstream}/glfw/src/posix_time.c (100%) rename {glfw/upstream => upstream}/glfw/src/posix_time.h (100%) rename {glfw/upstream => upstream}/glfw/src/vulkan.c (100%) rename {glfw/upstream => upstream}/glfw/src/wgl_context.c (100%) rename {glfw/upstream => upstream}/glfw/src/wgl_context.h (100%) rename {glfw/upstream => upstream}/glfw/src/win32_init.c (100%) rename {glfw/upstream => upstream}/glfw/src/win32_joystick.c (100%) rename {glfw/upstream => upstream}/glfw/src/win32_joystick.h (100%) rename {glfw/upstream => upstream}/glfw/src/win32_monitor.c (100%) rename {glfw/upstream => upstream}/glfw/src/win32_platform.h (100%) rename {glfw/upstream => upstream}/glfw/src/win32_thread.c (100%) rename {glfw/upstream => upstream}/glfw/src/win32_time.c (100%) rename {glfw/upstream => upstream}/glfw/src/win32_window.c (100%) rename {glfw/upstream => upstream}/glfw/src/window.c (100%) rename {glfw/upstream => upstream}/glfw/src/wl_init.c (100%) rename {glfw/upstream => upstream}/glfw/src/wl_monitor.c (100%) rename {glfw/upstream => upstream}/glfw/src/wl_platform.h (100%) rename {glfw/upstream => upstream}/glfw/src/wl_window.c (100%) rename {glfw/upstream => upstream}/glfw/src/x11_init.c (100%) rename {glfw/upstream => upstream}/glfw/src/x11_monitor.c (100%) rename {glfw/upstream => upstream}/glfw/src/x11_platform.h (100%) rename {glfw/upstream => upstream}/glfw/src/x11_window.c (100%) rename {glfw/upstream => upstream}/glfw/src/xkb_unicode.c (100%) rename {glfw/upstream => upstream}/glfw/src/xkb_unicode.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/.cmake-format.py (100%) rename {glfw/upstream => upstream}/vulkan_headers/.gitattributes (100%) rename {glfw/upstream => upstream}/vulkan_headers/.gitignore (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vk_icd.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vk_layer.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vk_platform.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vk_sdk_platform.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_android.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_beta.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_core.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_directfb.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_enums.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_fuchsia.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_funcs.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_ggp.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_handles.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_ios.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_macos.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_metal.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_raii.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_screen.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_structs.hpp (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_vi.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_wayland.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_win32.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_xcb.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_xlib.h (100%) rename {glfw/upstream => upstream}/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h (100%) diff --git a/glfw/build.zig b/build.zig similarity index 100% rename from glfw/build.zig rename to build.zig diff --git a/glfw/src/Cursor.zig b/src/Cursor.zig similarity index 100% rename from glfw/src/Cursor.zig rename to src/Cursor.zig diff --git a/glfw/src/GammaRamp.zig b/src/GammaRamp.zig similarity index 100% rename from glfw/src/GammaRamp.zig rename to src/GammaRamp.zig diff --git a/glfw/src/Image.zig b/src/Image.zig similarity index 100% rename from glfw/src/Image.zig rename to src/Image.zig diff --git a/glfw/src/Joystick.zig b/src/Joystick.zig similarity index 100% rename from glfw/src/Joystick.zig rename to src/Joystick.zig diff --git a/glfw/src/Monitor.zig b/src/Monitor.zig similarity index 100% rename from glfw/src/Monitor.zig rename to src/Monitor.zig diff --git a/glfw/src/VideoMode.zig b/src/VideoMode.zig similarity index 100% rename from glfw/src/VideoMode.zig rename to src/VideoMode.zig diff --git a/glfw/src/Window.zig b/src/Window.zig similarity index 100% rename from glfw/src/Window.zig rename to src/Window.zig diff --git a/glfw/src/action.zig b/src/action.zig similarity index 100% rename from glfw/src/action.zig rename to src/action.zig diff --git a/glfw/src/c.zig b/src/c.zig similarity index 100% rename from glfw/src/c.zig rename to src/c.zig diff --git a/glfw/src/clipboard.zig b/src/clipboard.zig similarity index 100% rename from glfw/src/clipboard.zig rename to src/clipboard.zig diff --git a/glfw/src/consts.zig b/src/consts.zig similarity index 100% rename from glfw/src/consts.zig rename to src/consts.zig diff --git a/glfw/src/errors.zig b/src/errors.zig similarity index 100% rename from glfw/src/errors.zig rename to src/errors.zig diff --git a/glfw/src/gamepad_axis.zig b/src/gamepad_axis.zig similarity index 100% rename from glfw/src/gamepad_axis.zig rename to src/gamepad_axis.zig diff --git a/glfw/src/gamepad_button.zig b/src/gamepad_button.zig similarity index 100% rename from glfw/src/gamepad_button.zig rename to src/gamepad_button.zig diff --git a/glfw/src/hat.zig b/src/hat.zig similarity index 100% rename from glfw/src/hat.zig rename to src/hat.zig diff --git a/glfw/src/key.zig b/src/key.zig similarity index 100% rename from glfw/src/key.zig rename to src/key.zig diff --git a/glfw/src/main.zig b/src/main.zig similarity index 100% rename from glfw/src/main.zig rename to src/main.zig diff --git a/glfw/src/mod.zig b/src/mod.zig similarity index 100% rename from glfw/src/mod.zig rename to src/mod.zig diff --git a/glfw/src/mouse_button.zig b/src/mouse_button.zig similarity index 100% rename from glfw/src/mouse_button.zig rename to src/mouse_button.zig diff --git a/glfw/src/opengl.zig b/src/opengl.zig similarity index 100% rename from glfw/src/opengl.zig rename to src/opengl.zig diff --git a/glfw/src/time.zig b/src/time.zig similarity index 100% rename from glfw/src/time.zig rename to src/time.zig diff --git a/glfw/src/version.zig b/src/version.zig similarity index 100% rename from glfw/src/version.zig rename to src/version.zig diff --git a/glfw/src/vulkan.zig b/src/vulkan.zig similarity index 100% rename from glfw/src/vulkan.zig rename to src/vulkan.zig diff --git a/glfw/update-upstream.sh b/update-upstream.sh similarity index 100% rename from glfw/update-upstream.sh rename to update-upstream.sh diff --git a/glfw/upstream/glfw/LICENSE.md b/upstream/glfw/LICENSE.md similarity index 100% rename from glfw/upstream/glfw/LICENSE.md rename to upstream/glfw/LICENSE.md diff --git a/glfw/upstream/glfw/include/GLFW/glfw3.h b/upstream/glfw/include/GLFW/glfw3.h similarity index 100% rename from glfw/upstream/glfw/include/GLFW/glfw3.h rename to upstream/glfw/include/GLFW/glfw3.h diff --git a/glfw/upstream/glfw/include/GLFW/glfw3native.h b/upstream/glfw/include/GLFW/glfw3native.h similarity index 100% rename from glfw/upstream/glfw/include/GLFW/glfw3native.h rename to upstream/glfw/include/GLFW/glfw3native.h diff --git a/glfw/upstream/glfw/src/cocoa_init.m b/upstream/glfw/src/cocoa_init.m similarity index 100% rename from glfw/upstream/glfw/src/cocoa_init.m rename to upstream/glfw/src/cocoa_init.m diff --git a/glfw/upstream/glfw/src/cocoa_joystick.h b/upstream/glfw/src/cocoa_joystick.h similarity index 100% rename from glfw/upstream/glfw/src/cocoa_joystick.h rename to upstream/glfw/src/cocoa_joystick.h diff --git a/glfw/upstream/glfw/src/cocoa_joystick.m b/upstream/glfw/src/cocoa_joystick.m similarity index 100% rename from glfw/upstream/glfw/src/cocoa_joystick.m rename to upstream/glfw/src/cocoa_joystick.m diff --git a/glfw/upstream/glfw/src/cocoa_monitor.m b/upstream/glfw/src/cocoa_monitor.m similarity index 100% rename from glfw/upstream/glfw/src/cocoa_monitor.m rename to upstream/glfw/src/cocoa_monitor.m diff --git a/glfw/upstream/glfw/src/cocoa_platform.h b/upstream/glfw/src/cocoa_platform.h similarity index 100% rename from glfw/upstream/glfw/src/cocoa_platform.h rename to upstream/glfw/src/cocoa_platform.h diff --git a/glfw/upstream/glfw/src/cocoa_time.c b/upstream/glfw/src/cocoa_time.c similarity index 100% rename from glfw/upstream/glfw/src/cocoa_time.c rename to upstream/glfw/src/cocoa_time.c diff --git a/glfw/upstream/glfw/src/cocoa_window.m b/upstream/glfw/src/cocoa_window.m similarity index 100% rename from glfw/upstream/glfw/src/cocoa_window.m rename to upstream/glfw/src/cocoa_window.m diff --git a/glfw/upstream/glfw/src/context.c b/upstream/glfw/src/context.c similarity index 100% rename from glfw/upstream/glfw/src/context.c rename to upstream/glfw/src/context.c diff --git a/glfw/upstream/glfw/src/egl_context.c b/upstream/glfw/src/egl_context.c similarity index 100% rename from glfw/upstream/glfw/src/egl_context.c rename to upstream/glfw/src/egl_context.c diff --git a/glfw/upstream/glfw/src/egl_context.h b/upstream/glfw/src/egl_context.h similarity index 100% rename from glfw/upstream/glfw/src/egl_context.h rename to upstream/glfw/src/egl_context.h diff --git a/glfw/upstream/glfw/src/glx_context.c b/upstream/glfw/src/glx_context.c similarity index 100% rename from glfw/upstream/glfw/src/glx_context.c rename to upstream/glfw/src/glx_context.c diff --git a/glfw/upstream/glfw/src/glx_context.h b/upstream/glfw/src/glx_context.h similarity index 100% rename from glfw/upstream/glfw/src/glx_context.h rename to upstream/glfw/src/glx_context.h diff --git a/glfw/upstream/glfw/src/init.c b/upstream/glfw/src/init.c similarity index 100% rename from glfw/upstream/glfw/src/init.c rename to upstream/glfw/src/init.c diff --git a/glfw/upstream/glfw/src/input.c b/upstream/glfw/src/input.c similarity index 100% rename from glfw/upstream/glfw/src/input.c rename to upstream/glfw/src/input.c diff --git a/glfw/upstream/glfw/src/internal.h b/upstream/glfw/src/internal.h similarity index 100% rename from glfw/upstream/glfw/src/internal.h rename to upstream/glfw/src/internal.h diff --git a/glfw/upstream/glfw/src/linux_joystick.c b/upstream/glfw/src/linux_joystick.c similarity index 100% rename from glfw/upstream/glfw/src/linux_joystick.c rename to upstream/glfw/src/linux_joystick.c diff --git a/glfw/upstream/glfw/src/linux_joystick.h b/upstream/glfw/src/linux_joystick.h similarity index 100% rename from glfw/upstream/glfw/src/linux_joystick.h rename to upstream/glfw/src/linux_joystick.h diff --git a/glfw/upstream/glfw/src/mappings.h b/upstream/glfw/src/mappings.h similarity index 100% rename from glfw/upstream/glfw/src/mappings.h rename to upstream/glfw/src/mappings.h diff --git a/glfw/upstream/glfw/src/monitor.c b/upstream/glfw/src/monitor.c similarity index 100% rename from glfw/upstream/glfw/src/monitor.c rename to upstream/glfw/src/monitor.c diff --git a/glfw/upstream/glfw/src/nsgl_context.h b/upstream/glfw/src/nsgl_context.h similarity index 100% rename from glfw/upstream/glfw/src/nsgl_context.h rename to upstream/glfw/src/nsgl_context.h diff --git a/glfw/upstream/glfw/src/nsgl_context.m b/upstream/glfw/src/nsgl_context.m similarity index 100% rename from glfw/upstream/glfw/src/nsgl_context.m rename to upstream/glfw/src/nsgl_context.m diff --git a/glfw/upstream/glfw/src/null_init.c b/upstream/glfw/src/null_init.c similarity index 100% rename from glfw/upstream/glfw/src/null_init.c rename to upstream/glfw/src/null_init.c diff --git a/glfw/upstream/glfw/src/null_joystick.c b/upstream/glfw/src/null_joystick.c similarity index 100% rename from glfw/upstream/glfw/src/null_joystick.c rename to upstream/glfw/src/null_joystick.c diff --git a/glfw/upstream/glfw/src/null_joystick.h b/upstream/glfw/src/null_joystick.h similarity index 100% rename from glfw/upstream/glfw/src/null_joystick.h rename to upstream/glfw/src/null_joystick.h diff --git a/glfw/upstream/glfw/src/null_monitor.c b/upstream/glfw/src/null_monitor.c similarity index 100% rename from glfw/upstream/glfw/src/null_monitor.c rename to upstream/glfw/src/null_monitor.c diff --git a/glfw/upstream/glfw/src/null_platform.h b/upstream/glfw/src/null_platform.h similarity index 100% rename from glfw/upstream/glfw/src/null_platform.h rename to upstream/glfw/src/null_platform.h diff --git a/glfw/upstream/glfw/src/null_window.c b/upstream/glfw/src/null_window.c similarity index 100% rename from glfw/upstream/glfw/src/null_window.c rename to upstream/glfw/src/null_window.c diff --git a/glfw/upstream/glfw/src/osmesa_context.c b/upstream/glfw/src/osmesa_context.c similarity index 100% rename from glfw/upstream/glfw/src/osmesa_context.c rename to upstream/glfw/src/osmesa_context.c diff --git a/glfw/upstream/glfw/src/osmesa_context.h b/upstream/glfw/src/osmesa_context.h similarity index 100% rename from glfw/upstream/glfw/src/osmesa_context.h rename to upstream/glfw/src/osmesa_context.h diff --git a/glfw/upstream/glfw/src/posix_thread.c b/upstream/glfw/src/posix_thread.c similarity index 100% rename from glfw/upstream/glfw/src/posix_thread.c rename to upstream/glfw/src/posix_thread.c diff --git a/glfw/upstream/glfw/src/posix_thread.h b/upstream/glfw/src/posix_thread.h similarity index 100% rename from glfw/upstream/glfw/src/posix_thread.h rename to upstream/glfw/src/posix_thread.h diff --git a/glfw/upstream/glfw/src/posix_time.c b/upstream/glfw/src/posix_time.c similarity index 100% rename from glfw/upstream/glfw/src/posix_time.c rename to upstream/glfw/src/posix_time.c diff --git a/glfw/upstream/glfw/src/posix_time.h b/upstream/glfw/src/posix_time.h similarity index 100% rename from glfw/upstream/glfw/src/posix_time.h rename to upstream/glfw/src/posix_time.h diff --git a/glfw/upstream/glfw/src/vulkan.c b/upstream/glfw/src/vulkan.c similarity index 100% rename from glfw/upstream/glfw/src/vulkan.c rename to upstream/glfw/src/vulkan.c diff --git a/glfw/upstream/glfw/src/wgl_context.c b/upstream/glfw/src/wgl_context.c similarity index 100% rename from glfw/upstream/glfw/src/wgl_context.c rename to upstream/glfw/src/wgl_context.c diff --git a/glfw/upstream/glfw/src/wgl_context.h b/upstream/glfw/src/wgl_context.h similarity index 100% rename from glfw/upstream/glfw/src/wgl_context.h rename to upstream/glfw/src/wgl_context.h diff --git a/glfw/upstream/glfw/src/win32_init.c b/upstream/glfw/src/win32_init.c similarity index 100% rename from glfw/upstream/glfw/src/win32_init.c rename to upstream/glfw/src/win32_init.c diff --git a/glfw/upstream/glfw/src/win32_joystick.c b/upstream/glfw/src/win32_joystick.c similarity index 100% rename from glfw/upstream/glfw/src/win32_joystick.c rename to upstream/glfw/src/win32_joystick.c diff --git a/glfw/upstream/glfw/src/win32_joystick.h b/upstream/glfw/src/win32_joystick.h similarity index 100% rename from glfw/upstream/glfw/src/win32_joystick.h rename to upstream/glfw/src/win32_joystick.h diff --git a/glfw/upstream/glfw/src/win32_monitor.c b/upstream/glfw/src/win32_monitor.c similarity index 100% rename from glfw/upstream/glfw/src/win32_monitor.c rename to upstream/glfw/src/win32_monitor.c diff --git a/glfw/upstream/glfw/src/win32_platform.h b/upstream/glfw/src/win32_platform.h similarity index 100% rename from glfw/upstream/glfw/src/win32_platform.h rename to upstream/glfw/src/win32_platform.h diff --git a/glfw/upstream/glfw/src/win32_thread.c b/upstream/glfw/src/win32_thread.c similarity index 100% rename from glfw/upstream/glfw/src/win32_thread.c rename to upstream/glfw/src/win32_thread.c diff --git a/glfw/upstream/glfw/src/win32_time.c b/upstream/glfw/src/win32_time.c similarity index 100% rename from glfw/upstream/glfw/src/win32_time.c rename to upstream/glfw/src/win32_time.c diff --git a/glfw/upstream/glfw/src/win32_window.c b/upstream/glfw/src/win32_window.c similarity index 100% rename from glfw/upstream/glfw/src/win32_window.c rename to upstream/glfw/src/win32_window.c diff --git a/glfw/upstream/glfw/src/window.c b/upstream/glfw/src/window.c similarity index 100% rename from glfw/upstream/glfw/src/window.c rename to upstream/glfw/src/window.c diff --git a/glfw/upstream/glfw/src/wl_init.c b/upstream/glfw/src/wl_init.c similarity index 100% rename from glfw/upstream/glfw/src/wl_init.c rename to upstream/glfw/src/wl_init.c diff --git a/glfw/upstream/glfw/src/wl_monitor.c b/upstream/glfw/src/wl_monitor.c similarity index 100% rename from glfw/upstream/glfw/src/wl_monitor.c rename to upstream/glfw/src/wl_monitor.c diff --git a/glfw/upstream/glfw/src/wl_platform.h b/upstream/glfw/src/wl_platform.h similarity index 100% rename from glfw/upstream/glfw/src/wl_platform.h rename to upstream/glfw/src/wl_platform.h diff --git a/glfw/upstream/glfw/src/wl_window.c b/upstream/glfw/src/wl_window.c similarity index 100% rename from glfw/upstream/glfw/src/wl_window.c rename to upstream/glfw/src/wl_window.c diff --git a/glfw/upstream/glfw/src/x11_init.c b/upstream/glfw/src/x11_init.c similarity index 100% rename from glfw/upstream/glfw/src/x11_init.c rename to upstream/glfw/src/x11_init.c diff --git a/glfw/upstream/glfw/src/x11_monitor.c b/upstream/glfw/src/x11_monitor.c similarity index 100% rename from glfw/upstream/glfw/src/x11_monitor.c rename to upstream/glfw/src/x11_monitor.c diff --git a/glfw/upstream/glfw/src/x11_platform.h b/upstream/glfw/src/x11_platform.h similarity index 100% rename from glfw/upstream/glfw/src/x11_platform.h rename to upstream/glfw/src/x11_platform.h diff --git a/glfw/upstream/glfw/src/x11_window.c b/upstream/glfw/src/x11_window.c similarity index 100% rename from glfw/upstream/glfw/src/x11_window.c rename to upstream/glfw/src/x11_window.c diff --git a/glfw/upstream/glfw/src/xkb_unicode.c b/upstream/glfw/src/xkb_unicode.c similarity index 100% rename from glfw/upstream/glfw/src/xkb_unicode.c rename to upstream/glfw/src/xkb_unicode.c diff --git a/glfw/upstream/glfw/src/xkb_unicode.h b/upstream/glfw/src/xkb_unicode.h similarity index 100% rename from glfw/upstream/glfw/src/xkb_unicode.h rename to upstream/glfw/src/xkb_unicode.h diff --git a/glfw/upstream/vulkan_headers/.cmake-format.py b/upstream/vulkan_headers/.cmake-format.py similarity index 100% rename from glfw/upstream/vulkan_headers/.cmake-format.py rename to upstream/vulkan_headers/.cmake-format.py diff --git a/glfw/upstream/vulkan_headers/.gitattributes b/upstream/vulkan_headers/.gitattributes similarity index 100% rename from glfw/upstream/vulkan_headers/.gitattributes rename to upstream/vulkan_headers/.gitattributes diff --git a/glfw/upstream/vulkan_headers/.gitignore b/upstream/vulkan_headers/.gitignore similarity index 100% rename from glfw/upstream/vulkan_headers/.gitignore rename to upstream/vulkan_headers/.gitignore diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_icd.h b/upstream/vulkan_headers/include/vulkan/vk_icd.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vk_icd.h rename to upstream/vulkan_headers/include/vulkan/vk_icd.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_layer.h b/upstream/vulkan_headers/include/vulkan/vk_layer.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vk_layer.h rename to upstream/vulkan_headers/include/vulkan/vk_layer.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_platform.h b/upstream/vulkan_headers/include/vulkan/vk_platform.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vk_platform.h rename to upstream/vulkan_headers/include/vulkan/vk_platform.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h b/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h rename to upstream/vulkan_headers/include/vulkan/vk_sdk_platform.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan.h b/upstream/vulkan_headers/include/vulkan/vulkan.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan.h rename to upstream/vulkan_headers/include/vulkan/vulkan.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan.hpp b/upstream/vulkan_headers/include/vulkan/vulkan.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_android.h b/upstream/vulkan_headers/include/vulkan/vulkan_android.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_android.h rename to upstream/vulkan_headers/include/vulkan/vulkan_android.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_beta.h b/upstream/vulkan_headers/include/vulkan/vulkan_beta.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_beta.h rename to upstream/vulkan_headers/include/vulkan/vulkan_beta.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_core.h b/upstream/vulkan_headers/include/vulkan/vulkan_core.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_core.h rename to upstream/vulkan_headers/include/vulkan/vulkan_core.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h b/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_directfb.h rename to upstream/vulkan_headers/include/vulkan/vulkan_directfb.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan_enums.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h b/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h rename to upstream/vulkan_headers/include/vulkan/vulkan_fuchsia.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan_funcs.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h b/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_ggp.h rename to upstream/vulkan_headers/include/vulkan/vulkan_ggp.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan_handles.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_ios.h b/upstream/vulkan_headers/include/vulkan/vulkan_ios.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_ios.h rename to upstream/vulkan_headers/include/vulkan/vulkan_ios.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_macos.h b/upstream/vulkan_headers/include/vulkan/vulkan_macos.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_macos.h rename to upstream/vulkan_headers/include/vulkan/vulkan_macos.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_metal.h b/upstream/vulkan_headers/include/vulkan/vulkan_metal.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_metal.h rename to upstream/vulkan_headers/include/vulkan/vulkan_metal.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan_raii.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_screen.h b/upstream/vulkan_headers/include/vulkan/vulkan_screen.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_screen.h rename to upstream/vulkan_headers/include/vulkan/vulkan_screen.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp b/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp rename to upstream/vulkan_headers/include/vulkan/vulkan_structs.hpp diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_vi.h b/upstream/vulkan_headers/include/vulkan/vulkan_vi.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_vi.h rename to upstream/vulkan_headers/include/vulkan/vulkan_vi.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h b/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_wayland.h rename to upstream/vulkan_headers/include/vulkan/vulkan_wayland.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_win32.h b/upstream/vulkan_headers/include/vulkan/vulkan_win32.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_win32.h rename to upstream/vulkan_headers/include/vulkan/vulkan_win32.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h b/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xcb.h rename to upstream/vulkan_headers/include/vulkan/vulkan_xcb.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h b/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib.h rename to upstream/vulkan_headers/include/vulkan/vulkan_xlib.h diff --git a/glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h b/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h similarity index 100% rename from glfw/upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h rename to upstream/vulkan_headers/include/vulkan/vulkan_xlib_xrandr.h From d0cf9fccf24785527dfc6d2c31e53dcde5f5e05c Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:20:03 -0700 Subject: [PATCH 4/6] glfw: cleanup vulkan_headers Signed-off-by: Stephen Gutekanst --- update-upstream.sh | 1 + upstream/vulkan_headers/.cmake-format.py | 34 ------------------------ upstream/vulkan_headers/.gitattributes | 16 ----------- upstream/vulkan_headers/.gitignore | 6 ----- 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 upstream/vulkan_headers/.cmake-format.py delete mode 100644 upstream/vulkan_headers/.gitattributes delete mode 100644 upstream/vulkan_headers/.gitignore diff --git a/update-upstream.sh b/update-upstream.sh index c6f21ea5..e6779449 100755 --- a/update-upstream.sh +++ b/update-upstream.sh @@ -21,3 +21,4 @@ git clone https://github.com/KhronosGroup/Vulkan-Headers vulkan_headers/ cd vulkan_headers rm -rf .git registry/ *.gn *.txt *.md cmake/ rm -rf include/vk_video +rm .cmake-format.py .gitattributes .gitignore diff --git a/upstream/vulkan_headers/.cmake-format.py b/upstream/vulkan_headers/.cmake-format.py deleted file mode 100644 index 07d2f99d..00000000 --- a/upstream/vulkan_headers/.cmake-format.py +++ /dev/null @@ -1,34 +0,0 @@ -# Configuration for cmake-format (v0.4.1, circa Jul 2018) -# https://github.com/cheshirekow/cmake_format - -# How wide to allow formatted cmake files -line_width = 132 - -# How many spaces to tab for indent -tab_size = 4 - -# If arglists are longer than this, break them always -max_subargs_per_line = 3 - -# If true, separate flow control names from their parentheses with a space -separate_ctrl_name_with_space = False - -# If true, separate function names from parentheses with a space -separate_fn_name_with_space = False - -# If a statement is wrapped to more than one line, than dangle the closing -# parenthesis on it's own line -dangle_parens = False - -# What character to use for bulleted lists -bullet_char = u'*' - -# What character to use as punctuation after numerals in an enumerated list -enum_char = u'.' - -# What style line endings to use in the output. -line_ending = u'unix' - -# Format command names consistently as 'lower' or 'upper' case -command_case = u'lower' - diff --git a/upstream/vulkan_headers/.gitattributes b/upstream/vulkan_headers/.gitattributes deleted file mode 100644 index ca85b461..00000000 --- a/upstream/vulkan_headers/.gitattributes +++ /dev/null @@ -1,16 +0,0 @@ -# See https://git-scm.com/docs/gitattributes -# See https://help.github.com/articles/dealing-with-line-endings/ - -# Default behavior, if core.autocrlf is unset. -* text=auto - -# Files to be converted to native line endings on checkout. -*.cpp text -*.h text - -# Text files to always have CRLF (dos) line endings on checkout. -*.bat text eol=crlf - -# Text files to always have LF (unix) line endings on checkout. -*.sh text eol=lf - diff --git a/upstream/vulkan_headers/.gitignore b/upstream/vulkan_headers/.gitignore deleted file mode 100644 index 61df0010..00000000 --- a/upstream/vulkan_headers/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# Python cache -__pycache__ -*.pyc -build -.vscode/ -**/.*.swp From 63f29665ff3ac4c5d7a701929087424c9a35b8c9 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:48:08 -0700 Subject: [PATCH 5/6] glfw: update README Signed-off-by: Stephen Gutekanst --- README.md | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index bf7cb154..217be571 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,38 @@ -Mach - Game engine & graphics toolkit for the future +# mach/glfw - Ziggified GLFW bindings [![CI](https://github.com/hexops/engine/workflows/CI/badge.svg)](https://github.com/hexops/engine/actions) Hexops logo -# Mach engine [![CI](https://github.com/hexops/engine/workflows/CI/badge.svg)](https://github.com/hexops/engine/actions) Hexops logo +This repository contains the ziggified GLFW bindings that [Mach engine](https://github.com/hexops/mach) uses. The main Mach repository includes this one as a `git subtree`. -## ⚠️ Project status: in-development ⚠️ +The intent is that anyone can use this library in their own project / engine if they like! -Under heavy development, not ready for use currently. [Follow @machengine on Twitter](https://twitter.com/machengine) for updates. +## Zero fuss installation, cross compilation, and more -## Zero fuss installation & cross compilation +[Just as with Mach](https://github.com/hexops/mach#zero-fuss-installation--cross-compilation), you just zero fuss installation & cross compilation using these GLFW bindings. **only `zig` and `git` are needed to build from any OS and produce binaries for every OS.** -Mach is built from the ground up to support zero fuss installation & cross compilation, **only `zig` and `git` are needed to build from any OS and produce binaries for every OS.** +See also: [platform support table](https://github.com/hexops/mach#supported-platforms) -You do **not** need any system dependencies, C libraries, SDKs (Xcode, etc.), C compilers or anything else. +## 100% API coverage -If you've ever worked with game engines in Go, Rust, or any other language you've probably run into issues at one point getting the right system dependencies installed, whether it be Xcode versions, compilers, X11/GLFW/SDL C dependencies, etc. +These bindings recently achieved 100% API coverage of GLFW v3.3.4. Every function, type, etc. has been wrapped in a ziggified API. -Mach is able to do this thanks to Zig being a C/C++ compiler, Zig's linker `zld` supporting macOS cross compilation, and us doing the heavy lifting of packaging the required [system SDK libraries](https://github.com/hexops/sdk-macos-11.3) and [C sources](glfw/upstream/) for every dependency we need so our Zig build scripts can simply `git clone` them for you as needed for the target OS you're building for, completely automagically. +## What does a ziggified GLFW API offer? -## Supported platforms +You could just `@cImport` GLFW with Zig - the main reasons to use a ziggified wrapper though are because you get: -Mach is still incredibly early stages, so far we have support for building from the following OS to the following targets: +* `true` and `false` booleans instead of `c.GLFW_TRUE` and `c.GLFW_FALSE` integers +* Methods, so you can write e.g. `window.hint` instead of `glfwWindowHint` +* Generics, so you can just use `window.hint` instead of `glfwWindowHint`, `glfwWindowHintString`, etc. +* Enums, so you can write `window.getKey(.escape)` instead of `c.glfwGetKey(window, c.GLFW_KEY_ESCAPE)` +* Slices instead of C pointers and lengths. +* [`packed struct`](https://ziglang.org/documentation/master/#packed-struct) to represent bit masks, so you can interact with each bit the same way you'd interact with a `bool` if you like, instead of remembering the `&` `|` `^` incantation (although you're free to do that too.) -| Building for | From macOS x86_64 | From macOS M1/aarch64 | From Linux x86_64 | From Windows x86_64 | -|------------------|-------------------|-----------------------|-------------------|---------------------| -| macOS x86_64 | ✅ | ✅ | ✅ | ✅ | -| macOS M1/aarch64 | ✅ | ✅ | ✅ | ✅ | -| Linux x86_64 | ✅ | ✅ | ✅ | ✅ | -| Windows x86_64 | ✅ | ✅ | ✅ | ✅ | -| iOS | 🏃 | 🏃 | 🏃 | 🏃 | -| Android | 🏃 | 🏃 | 🏃 | 🏃 | +## Issues -* ✅ Tested and verified via CI. -* ✔️ Should work, not tested via CI yet. -* 🏃 Planned or in progress. -* ⚠️ Implemented, but has known issues (e.g. bugs in Zig.) +Issues are tracked in the [main Mach repository](https://github.com/hexops/mach/issues?q=is%3Aissue+is%3Aopen+label%3Aglfw). + +## Contributing + +Contributions are very welcome. Just send a PR to this repository. + +We track the latest stable release of GLFW, if you need a newer version we can start a development branch / figure that out - just open an issue. + +Once your PR is merged, if you're using Mach engine and wanting the changes there, it will be sync'd to the main repo via `git subtree`. From 3d19b4993cb6dd2994cadcf84a42a65908bc0993 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 24 Oct 2021 05:50:56 -0700 Subject: [PATCH 6/6] glfw: README: cleanup --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 217be571..68c0496b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # mach/glfw - Ziggified GLFW bindings [![CI](https://github.com/hexops/engine/workflows/CI/badge.svg)](https://github.com/hexops/engine/actions) Hexops logo -This repository contains the ziggified GLFW bindings that [Mach engine](https://github.com/hexops/mach) uses. The main Mach repository includes this one as a `git subtree`. +Ziggified GLFW bindings that [Mach engine](https://github.com/hexops/mach) uses, with 100% API coverage & zero-fuss installation, cross compilation, and more. -The intent is that anyone can use this library in their own project / engine if they like! +The main Mach repository includes this one as a `git subtree`. This is a separate repo so that anyone can use this library in their own project / engine if they like! ## Zero fuss installation, cross compilation, and more -[Just as with Mach](https://github.com/hexops/mach#zero-fuss-installation--cross-compilation), you just zero fuss installation & cross compilation using these GLFW bindings. **only `zig` and `git` are needed to build from any OS and produce binaries for every OS.** +[Just as with Mach](https://github.com/hexops/mach#zero-fuss-installation--cross-compilation), you get zero fuss installation & cross compilation using these GLFW bindings. **only `zig` and `git` are needed to build from any OS and produce binaries for every OS.** No system dependencies at all. See also: [platform support table](https://github.com/hexops/mach#supported-platforms)