Skip to content

Commit 0c0c4e6

Browse files
authored
Merge pull request #25 from arhik/main
workflow update
2 parents 1ecb970 + 5bd4986 commit 0c0c4e6

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/CI.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
version:
21-
- '1.9'
2221
- '1.10'
22+
- '1.11'
2323
os:
2424
- ubuntu-latest
2525
arch:
@@ -32,7 +32,9 @@ jobs:
3232
arch: ${{ matrix.arch }}
3333
- uses: julia-actions/cache@v1
3434
- 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
35-
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"add . WGPUNative"'
35+
- 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"'
36+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"resolve"'
37+
- 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"'
3638
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
3739
- uses: julia-actions/julia-processcoverage@v1
3840
- uses: codecov/codecov-action@v2
@@ -49,7 +51,9 @@ jobs:
4951
with:
5052
version: '1'
5153
- 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
52-
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; pkg"add . WGPUNative"'
54+
- 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"'
55+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"resolve"'
56+
- 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"'
5357
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
5458
- uses: julia-actions/julia-docdeploy@v1
5559
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
/deps/cocoa.dylib
77
/deps/*.tar.gz
88
.DS_Store
9+
*.wgsl

src/buffer.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function mapWrite(gpuBuffer::GPUBuffer, data)
6060
buffercallbackInfo.callback = buffercallback
6161

6262
wgpuBufferMapAsync(
63-
gpuBuffer.internal,
63+
gpuBuffer.internal[],
6464
WGPUMapMode_Write,
6565
0,
6666
bufferSize,
@@ -93,11 +93,11 @@ function createBuffer(label, gpuDevice, bufSize, usage, mappedAtCreation)
9393
usage = getEnum(WGPUBufferUsage, usage),
9494
mappedAtCreation = mappedAtCreation,
9595
)
96-
buffer = GC.@preserve labelPtr wgpuDeviceCreateBuffer(
96+
buffer = wgpuDeviceCreateBuffer(
9797
gpuDevice.internal[],
9898
desc |> ptr,
99-
) |> Ref
100-
GPUBuffer(label, buffer, gpuDevice, bufSize, usage, desc)
99+
)
100+
GPUBuffer(label, buffer |> Ref, gpuDevice, bufSize, usage, desc)
101101
end
102102

103103
function createBufferWithData(gpuDevice, label, data, usage)

0 commit comments

Comments
 (0)