Skip to content

workflow update #25

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Apr 14, 2025
Merged

workflow update #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1a218f
snapshot
arhik Mar 27, 2024
5583921
Merge branch 'main' of https://github.com/arhik/WGPUCore.jl
arhik Jul 11, 2024
1eedef8
Update .gitignore
arhik Jul 13, 2024
5206bdc
Merge upstream/main into main
arhik Apr 14, 2025
9fa2e27
mac surface changes
arhik Apr 14, 2025
69e1302
Update workflow CI
arhik Apr 14, 2025
be98b81
add Pkg"resolve" to documentation workflow to resolve stale manifests
arhik Apr 14, 2025
5bd4986
Update CI.yml
arhik Apr 14, 2025
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
10 changes: 7 additions & 3 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1.10'
- '1.11'
os:
- ubuntu-latest
arch:
Expand All @@ -32,7 +32,9 @@ jobs:
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- run : sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add . WGPUNative"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add https://github.com/JuliaWGPU/WGPUNative.jl"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"resolve"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add https://github.com/JuliaWGPU/WGPUCore.jl"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v2
Expand All @@ -49,7 +51,9 @@ jobs:
with:
version: '1'
- run : sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; pkg"add . WGPUNative"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add https://github.com/JuliaWGPU/WGPUNative.jl"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"resolve"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add https://github.com/JuliaWGPU/WGPUCore.jl"'
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
- uses: julia-actions/julia-docdeploy@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/deps/cocoa.dylib
/deps/*.tar.gz
.DS_Store
*.wgsl
8 changes: 4 additions & 4 deletions src/buffer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function mapWrite(gpuBuffer::GPUBuffer, data)
buffercallbackInfo.callback = buffercallback

wgpuBufferMapAsync(
gpuBuffer.internal,
gpuBuffer.internal[],
WGPUMapMode_Write,
0,
bufferSize,
Expand Down Expand Up @@ -93,11 +93,11 @@ function createBuffer(label, gpuDevice, bufSize, usage, mappedAtCreation)
usage = getEnum(WGPUBufferUsage, usage),
mappedAtCreation = mappedAtCreation,
)
buffer = GC.@preserve labelPtr wgpuDeviceCreateBuffer(
buffer = wgpuDeviceCreateBuffer(
gpuDevice.internal[],
desc |> ptr,
) |> Ref
GPUBuffer(label, buffer, gpuDevice, bufSize, usage, desc)
)
GPUBuffer(label, buffer |> Ref, gpuDevice, bufSize, usage, desc)
end

function createBufferWithData(gpuDevice, label, data, usage)
Expand Down
Loading