Skip to content

Commit

Permalink
syncing with upstream version v0.17.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@arhik
arhik committed Oct 21, 2023
1 parent a90c946 commit a81081e
Show file tree
Hide file tree
Showing 5 changed files with 462 additions and 234 deletions.
30 changes: 15 additions & 15 deletions Artifacts.toml
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
[[WGPUNative]]
arch = "arm64"
git-tree-sha1 = "9c20d51368e06226b46d99c7d909d41cc183532f"
git-tree-sha1 = "cfa4499f9f1a6295e419648f5dc1ba430d8f4d8a"
os = "macos"

[[WGPUNative.download]]
sha256 = "a55d528e158f617efa1ec2edaa5d1784416a5ffe74ba607820a4461b6f6d7672"
url = "https://github.com/dvijaha/WGPUNative.jl/releases/download/v.0.1.2/WGPU.v.0.1.2.arm64-macos.tar.gz"
sha256 = "3e85d282f04bfbb183dc5eab7f45126182a42dc689f1291dd53feb194d82681f"
url = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/v.0.1.3/WGPU.v0.17.2.1.arm64-macos.tar.gz"

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "4c29f2fcccfddff281e71b938601ffdf5b34d56b"
git-tree-sha1 = "68395d26d3b3a6cfc04f28ab8e465c66509c88f2"
os = "macos"

[[WGPUNative.download]]
sha256 = "c1fe27b79ffe5c9748733dd15c60aaeb89b36a83d7fa99b61b1a16eb753cf5f4"
url = "https://github.com/dvijaha/WGPUNative.jl/releases/download/v.0.1.2/WGPU.v.0.1.2.x86_64-macos.tar.gz"
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"

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "5b9c3a45d72da066dc555579981e80d467436a77"
git-tree-sha1 = "7e2229e437b23f64ff6d3533db50c3b10ade1a42"
os = "linux"

[[WGPUNative.download]]
sha256 = "b19bc1ef1b48457b9c8cef611c77aeebf477ba03175a868e0ef47950b61847b4"
url = "https://github.com/dvijaha/WGPUNative.jl/releases/download/v.0.1.2/WGPU.v.0.1.2.x86_64-linux.tar.gz"
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"

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

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

[[WGPUNative]]
arch = "x86_64"
git-tree-sha1 = "99440a5403e070add0e0a6cd9444a277df54df2b"
git-tree-sha1 = "eb1552d6c727b018c5d88f8a194531e151fb9a1b"
os = "windows"

[[WGPUNative.download]]
sha256 = "dc8ab6c4b3cf20c761fd5feb4804694b6d665b03fad7ceb489c6511c2aa482fb"
url = "https://github.com/dvijaha/WGPUNative.jl/releases/download/v.0.1.2/WGPU.v.0.1.2.x86_64-windows.tar.gz"
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"

15 changes: 0 additions & 15 deletions examples/requestDevice.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,8 @@ wgpuSetLogLevel(WGPULogLevel_Debug)

adapter = Ref{WGPUAdapter}()

chain = cStruct(
WGPUChainedStruct;
sType = WGPUSType(Int64(WGPUSType_AdapterExtras)),
)


extras = cStruct(
WGPUAdapterExtras;
backend=WGPUBackendType_Vulkan, # TODO hardcoding on windows for now
chain = chain |> concrete
)

# extras.chain = chain |> concrete

adapterOptions = cStruct(WGPURequestAdapterOptions)
adapterOptions.compatibleSurface = C_NULL
adapterOptions.nextInChain = rawCast(WGPUChainedStruct, extras)
adapterOptions.powerPreference = WGPUPowerPreference_HighPerformance
adapterOptions.forceFallbackAdapter = false

Expand Down
14 changes: 8 additions & 6 deletions gen/artifacts.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ 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.2"
version = "v.0.1.3"
kernels = ["macos", "linux", "windows"]
archs = ["arm64", "i686", "x86_64"]

upstreamVersion = "v0.17.2.1"

io = IOBuffer()

function writeIO(io, arch, kernel, sha1, sha256, filename, url)
Expand All @@ -32,15 +34,15 @@ function writeIO(io, arch, kernel, sha1, sha256, filename, url)
)
end

remoteurl = "https://github.com/dvijaha/WGPUNative.jl/releases/download/v.0.1.2"
remoteurl = "https://github.com/JuliaWGPU/WGPUNative.jl/releases/download/$(version)"

function generateArtifacts()
for kernel in kernels
for arch in archs
releasefile = "wgpu-$kernel-$arch-release.zip"
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
tarfile = "WGPU.$(upstreamVersion).$(arch)-$(kernel).tar.gz"
try
url = "https://github.com/gfx-rs/wgpu-native/releases/download/v0.16.0.1/$releasefile"
url = "https://github.com/gfx-rs/wgpu-native/releases/download/$(upstreamVersion)/$releasefile"
Downloads.download(url, releasefile)
run(`rm -rf "wgpulibs$arch$kernel"`)
run(`mkdir wgpulibs$arch$kernel`)
Expand All @@ -59,9 +61,9 @@ function writeArtifactsTOML()
for kernel in kernels
for arch in archs
releasefile = "wgpu-$kernel-$arch-release.zip"
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
tarfile = "WGPU.$(upstreamVersion).$(arch)-$(kernel).tar.gz"
try
Downloads.download(joinpath(remoteurl, tarfile), tarfile)
# Downloads.download(joinpath(remoteurl, tarfile), tarfile)
sha256Val = bytes2hex(open(sha256, tarfile))
sha1Val = Tar.tree_hash(IOBuffer(inflate_gzip(tarfile)))
writeIO(io, arch, kernel, sha1Val, sha256Val, "", joinpath(remoteurl, tarfile))
Expand Down
4 changes: 3 additions & 1 deletion gen/generator.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ end
releasefile = "wgpu-$kernel-$arch-release.zip"
location = "$releasefile"

url = "https://github.com/gfx-rs/wgpu-native/releases/download/v0.16.0.1/wgpu-$kernel-$arch-release.zip"
upstreamVersion = "v0.17.2.1"

url = "https://github.com/gfx-rs/wgpu-native/releases/download/$(upstreamVersion)/wgpu-$kernel-$arch-release.zip"
download(url, location)
run(`rm -rf wgpulib`)
run(`mkdir wgpulib`)
Expand Down
Loading

4 comments on commit a81081e

@arhik
Copy link
Member Author

@arhik arhik commented on a81081e Oct 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Changing package repo URL not allowed, please submit a pull request with the URL change to the target registry and retry.

@arhik
Copy link
Member Author

@arhik arhik commented on a81081e Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/95233

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.3 -m "<description of version>" a81081e6ebad2c86f5df8ebbc66b0010c9df795c
git push origin v0.1.3

Please sign in to comment.