Skip to content
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.

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

update to upstream wgpu-native version v0.19.1.1 #6

Merged
merged 4 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
Manifest.toml
41 changes: 25 additions & 16 deletions Artifacts.toml
Original file line number Diff line number Diff line change
@@ -1,45 +1,54 @@
[[WGPUNative]]
arch = "arm64"
git-tree-sha1 = "cfa4499f9f1a6295e419648f5dc1ba430d8f4d8a"
arch = "aarch64"
git-tree-sha1 = "afe4970afdd9e4bdd0ff09fe6f3a700a8bde91d5"
os = "macos"

[[WGPUNative.download]]
sha256 = "3e85d282f04bfbb183dc5eab7f45126182a42dc689f1291dd53feb194d82681f"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.arm64-macos.tar.gz"
sha256 = "130607d01b087873ce90926c9866a7f8933bd8f25ff3ec534f02695a2321c0d8"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.aarch64-macos.tar.gz"

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "68395d26d3b3a6cfc04f28ab8e465c66509c88f2"
git-tree-sha1 = "5a225725b19d532c051dd6e3460f084f7a09235f"
os = "macos"

[[WGPUNative.download]]
sha256 = "898721dbacbf9da77e54d0ddb8691bf74c9b6d06893dfad2141c3c49f5dab11d"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.x86_64-macos.tar.gz"
sha256 = "63001977124c311b99505b0e47781613f6b56fd9cd0aaf003bfad3bc2809d4a3"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.x86_64-macos.tar.gz"

[[WGPUNative]]
arch = "aarch64"
git-tree-sha1 = "546fe010c16973c2050eb3acb7135f8939181dd1"
os = "linux"

[[WGPUNative.download]]
sha256 = "9de6d0b1d1e3ab0d09463e6580f6fcb3b5f574a91fab98380f42eed1ec3b9ac9"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.aarch64-linux.tar.gz"

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "7e2229e437b23f64ff6d3533db50c3b10ade1a42"
git-tree-sha1 = "2f2174340dcf7bf6d662837876775f3b3306ca12"
os = "linux"

[[WGPUNative.download]]
sha256 = "1bf8339dec42b4708c94a3ee540f1672fc1ad81d5c2a168643514e66e976caca"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.x86_64-linux.tar.gz"
sha256 = "c8ae71b35290f37be517ea6b91c229afa785c7367623d0bc032ab3a184690b0c"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.x86_64-linux.tar.gz"

[[WGPUNative]]
arch = "i686"
git-tree-sha1 = "6b3851e466807a5093adac0ca1bb3561f1e2d87f"
git-tree-sha1 = "e215f8718a89c444488d498948533bd09a878860"
os = "windows"

[[WGPUNative.download]]
sha256 = "b7bd0a0d84e9ea152cac1577ded684a589b610f4603a58def1d0bfd4514825d3"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.i686-windows.tar.gz"
sha256 = "5788e263eeef71d025383f44ea36bba150802f6520e0d734aa3ef9115a1f02e8"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.i686-windows.tar.gz"

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "eb1552d6c727b018c5d88f8a194531e151fb9a1b"
git-tree-sha1 = "63f01113459e9d68a7e1e857556c34f70fb20db8"
os = "windows"

[[WGPUNative.download]]
sha256 = "61dd01d6808dad22dd08cbcf0903839ffece9e93249af56340f48b756b4454eb"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.x86_64-windows.tar.gz"
sha256 = "ca8a7667f1884f7107a7e727eb20b80af3bd6023e0bf15a51d31b75fce0563e9"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.4/WGPU.v0.19.1.1.x86_64-windows.tar.gz"

8 changes: 4 additions & 4 deletions Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.0"
julia_version = "1.10.1"
manifest_format = "2.0"
project_hash = "6431c9f0f959bf0c2bd0e31c21f54631b1f52acc"

Expand All @@ -26,10 +26,10 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
version = "0.5.0"

[[deps.Compat]]
deps = ["UUIDs"]
git-tree-sha1 = "886826d76ea9e72b35fcd000e535588f7b60f21d"
deps = ["TOML", "UUIDs"]
git-tree-sha1 = "d2c021fbdde94f6cdaa799639adfeeaa17fd67f5"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "4.10.1"
version = "4.13.0"

[deps.Compat.extensions]
CompatLinearAlgebraExt = "LinearAlgebra"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

# WGPUNative.jl

WGPU (Wgpu-native) julia bindings
WGPU (wgpu-native) julia bindings

Supports following architectures

* `macOS aarch64` (`aarch64-apple-darwin`)
* `Linux i686 {libc=glibc}` (`i686-linux-gnu`)
* `Linux aarch64 {libc=glibc}` (`aarch64-linux-gnu`)
* `Windows i686` (`i686-w64-mingw32`)
* `macOS x86_64` (`x86_64-apple-darwin`)
* `Linux x86_64 {libc=glibc}` (`x86_64-linux-gnu`)
Expand Down
6 changes: 3 additions & 3 deletions gen/artifacts.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ kernel = lowercase(String(Sys.KERNEL))
# modifying conventions for wgpu specifically based on
# releases at https://github.com/gfx-rs/wgpu-native/releases/tag/v0.12.0.1

version = "v.0.1.3"
version = "v.0.1.4"
kernels = ["macos", "linux", "windows"]
archs = ["arm64", "i686", "x86_64"]
archs = ["aarch64", "i686", "x86_64"]

upstreamVersion = "v0.17.2.1"
upstreamVersion = "v0.19.1.1"

io = IOBuffer()

Expand Down
2 changes: 1 addition & 1 deletion gen/generator.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kernel = lowercase(String(Sys.KERNEL))
if kernel == "darwin"
kernel = "macos"
if arch == "aarch64"
arch = "arm64"
arch = "aarch64"
end
end

Expand Down
5 changes: 4 additions & 1 deletion src/cUtils.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

module CUtils

export CStruct, cStruct, ptr, concrete, rawCast, cast, toCString, fromCString
export CStruct, cStruct, ptr, concrete, rawCast, cast, toCString, fromCString, toByteArray

mutable struct CStruct{T}
ptr::Ptr{T}
Expand Down Expand Up @@ -117,4 +117,7 @@ function toByteArray(cstruct::CStruct{T}) where T
unsafe_wrap(Array, bytePtr, sizeof(cstruct))
end

#Base.fieldnames(::Type{CStruct{T}}) where T = Base.fieldnames(T)
Base.propertynames(a::CStruct{T}) where T = Base.fieldnames(T)

end