diff --git a/vendor/wgpu/.gitignore b/vendor/wgpu/.gitignore index 330d70755..80c337a4d 100644 --- a/vendor/wgpu/.gitignore +++ b/vendor/wgpu/.gitignore @@ -1,5 +1,5 @@ lib/* -!lib/.gitkeep +!lib/wgpu-windows-x86_64-msvc-release example/web/triangle.wasm example/web/wgpu.js example/web/runtime.js diff --git a/vendor/wgpu/README.md b/vendor/wgpu/README.md index 0f80db6de..83fd16f58 100644 --- a/vendor/wgpu/README.md +++ b/vendor/wgpu/README.md @@ -11,8 +11,8 @@ Have a look at the `example/` directory for the rendering of a basic triangle. ## Getting the wgpu-native libraries For native support (not the browser), some libraries are required. Fortunately this is -extremely easy, just download them from the [releases on GitHub](https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.1), -the bindings are for v24.0.1 at the moment. +extremely easy, just download them from the [releases on GitHub](https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.0.1), +the bindings are for v24.0.0.1 at the moment. These are expected in the `lib` folder under the same name as they are released (just unzipped). By default it will look for a static release version (`wgpu-OS-ARCH-release.a|lib`), diff --git a/vendor/wgpu/lib/.gitkeep b/vendor/wgpu/lib/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll new file mode 100644 index 000000000..360d8b431 Binary files /dev/null and b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll differ diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll.lib b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll.lib new file mode 100644 index 000000000..b3a29a522 Binary files /dev/null and b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.dll.lib differ diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.lib b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.lib similarity index 73% rename from vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.lib rename to vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.lib index 7c9f95c33..93130432a 100644 Binary files a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.lib and b/vendor/wgpu/lib/wgpu-windows-x86_64-msvc-release/lib/wgpu_native.lib differ diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll b/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll deleted file mode 100644 index b8f782a2f..000000000 Binary files a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll and /dev/null differ diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll.lib b/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll.lib deleted file mode 100644 index 864b7eb53..000000000 Binary files a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.dll.lib and /dev/null differ diff --git a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.pdb b/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.pdb deleted file mode 100644 index 52865e174..000000000 Binary files a/vendor/wgpu/lib/wgpu-windows-x86_64-release/wgpu_native.pdb and /dev/null differ diff --git a/vendor/wgpu/wgpu.odin b/vendor/wgpu/wgpu.odin index b64b9fe5f..54c4496a6 100644 --- a/vendor/wgpu/wgpu.odin +++ b/vendor/wgpu/wgpu.odin @@ -10,10 +10,10 @@ WGPU_DEBUG :: #config(WGPU_DEBUG, false) when ODIN_OS == .Windows { @(private) ARCH :: "x86_64" when ODIN_ARCH == .amd64 else "x86_64" when ODIN_ARCH == .i386 else #panic("unsupported WGPU Native architecture") @(private) EXT :: ".dll.lib" when WGPU_SHARED else ".lib" - @(private) LIB :: "lib/wgpu-windows-" + ARCH + "-" + TYPE + "/lib/wgpu_native" + EXT + @(private) LIB :: "lib/wgpu-windows-" + ARCH + "-msvc-" + TYPE + "/lib/wgpu_native" + EXT when !#exists(LIB) { - #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.1, make sure to read the README at '" + #directory + "README.md'") + #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.0.1, make sure to read the README at '" + #directory + "README.md'") } @(export) @@ -37,7 +37,7 @@ when ODIN_OS == .Windows { @(private) LIB :: "lib/wgpu-macos-" + ARCH + "-" + TYPE + "/lib/libwgpu_native" + EXT when !#exists(LIB) { - #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.1, make sure to read the README at '" + #directory + "README.md'") + #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.0.1, make sure to read the README at '" + #directory + "README.md'") } @(export) @@ -53,7 +53,7 @@ when ODIN_OS == .Windows { @(private) LIB :: "lib/wgpu-linux-" + ARCH + "-" + TYPE + "/lib/libwgpu_native" + EXT when !#exists(LIB) { - #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.1, make sure to read the README at '" + #directory + "README.md'") + #panic("Could not find the compiled WGPU Native library at '" + #directory + LIB + "', these can be downloaded from https://github.com/gfx-rs/wgpu-native/releases/tag/v24.0.0.1, make sure to read the README at '" + #directory + "README.md'") } @(export) diff --git a/vendor/wgpu/wgpu_native_types.odin b/vendor/wgpu/wgpu_native_types.odin index 942c18b88..4bc19b4c2 100644 --- a/vendor/wgpu/wgpu_native_types.odin +++ b/vendor/wgpu/wgpu_native_types.odin @@ -2,8 +2,8 @@ package wgpu import "base:runtime" -BINDINGS_VERSION :: [4]u8{24, 0, 1, 0} -BINDINGS_VERSION_STRING :: "24.0.1" +BINDINGS_VERSION :: [4]u8{24, 0, 0, 1} +BINDINGS_VERSION_STRING :: "24.0.0.1" LogLevel :: enum i32 { Off,