Skip to content
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
2 changes: 1 addition & 1 deletion generate/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion generate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
webidl2wit = { git = "https://github.com/wasi-gfx/webidl2wit", rev = "5693d1151834fceddf0e4fd4b9288675a930388e" }
webidl2wit = { git = "https://github.com/wasi-gfx/webidl2wit", rev = "f342f815af71e8c2c9d7eb57cee4c6d91e1cfdd5" }
weedle = "0.13.1"
wit-transforms = { git = "https://github.com/wasi-gfx/wit-transforms", rev = "82bce93fa23d7e2232f85a46898bc62d225e8317" }
wit-parser = "0.250"
Expand Down
62 changes: 21 additions & 41 deletions generate/webgpu-transforms.json
Original file line number Diff line number Diff line change
Expand Up @@ -1523,10 +1523,7 @@
"func-result": {
"resource": "gpu-adapter",
"func": "request-device"
},
"unwrap-t": [
"future"
]
}
}
}
},
Expand All @@ -1535,12 +1532,10 @@
"resource": "gpu-adapter",
"func": "request-device",
"new-result": {
"future": {
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "request-device-error"
}
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "request-device-error"
}
}
}
Expand Down Expand Up @@ -1601,10 +1596,7 @@
"func-result": {
"resource": "gpu-device",
"func": "create-compute-pipeline-async"
},
"unwrap-t": [
"future"
]
}
}
}
},
Expand All @@ -1613,12 +1605,10 @@
"resource": "gpu-device",
"func": "create-compute-pipeline-async",
"new-result": {
"future": {
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "create-pipeline-error"
}
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "create-pipeline-error"
}
}
}
Expand All @@ -1632,10 +1622,7 @@
"func-result": {
"resource": "gpu-device",
"func": "create-render-pipeline-async"
},
"unwrap-t": [
"future"
]
}
}
}
},
Expand All @@ -1644,12 +1631,10 @@
"resource": "gpu-device",
"func": "create-render-pipeline-async",
"new-result": {
"future": {
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "create-pipeline-error"
}
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "create-pipeline-error"
}
}
}
Expand Down Expand Up @@ -1787,10 +1772,7 @@
"func-result": {
"resource": "gpu-device",
"func": "pop-error-scope"
},
"unwrap-t": [
"future"
]
}
}
}
},
Expand All @@ -1799,12 +1781,10 @@
"resource": "gpu-device",
"func": "pop-error-scope",
"new-result": {
"future": {
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "pop-error-scope-error"
}
"result": {
"ok": "$_SUCCESS",
"err": {
"named": "pop-error-scope-error"
}
}
}
Expand Down Expand Up @@ -1997,7 +1977,7 @@
]
},
{
"reason": "unmap throws if called while future returned by map-async is still pending. https://www.w3.org/TR/webgpu/#dom-gpubuffer-unmap",
"reason": "unmap throws if called while map-async is still pending. https://www.w3.org/TR/webgpu/#dom-gpubuffer-unmap",
"operations": [
{
"operation": {
Expand Down
16 changes: 8 additions & 8 deletions wit/webgpu.wit
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ interface webgpu {
type-error,
}
resource gpu {
request-adapter: func(options: option<gpu-request-adapter-options>) -> future<option<gpu-adapter>>;
request-adapter: async func(options: option<gpu-request-adapter-options>) -> option<gpu-adapter>;
get-preferred-canvas-format: func() -> gpu-texture-format;
wgsl-language-features: func() -> wgsl-language-features;
}
resource gpu-adapter {
features: func() -> gpu-supported-features;
limits: func() -> gpu-supported-limits;
info: func() -> gpu-adapter-info;
request-device: func(descriptor: option<gpu-device-descriptor>) -> future<result<gpu-device, request-device-error>>;
request-device: async func(descriptor: option<gpu-device-descriptor>) -> result<gpu-device, request-device-error>;
}
resource gpu-adapter-info {
vendor: func() -> string;
Expand Down Expand Up @@ -124,7 +124,7 @@ interface webgpu {
size: func() -> gpu-size64-out;
usage: func() -> gpu-buffer-usage;
map-state: func() -> gpu-buffer-map-state;
map-async: func(mode: gpu-map-mode, offset: option<gpu-size64>, size: option<gpu-size64>) -> result<_, map-async-error>;
map-async: async func(mode: gpu-map-mode, offset: option<gpu-size64>, size: option<gpu-size64>) -> result<_, map-async-error>;
get-mapped-range-get-with-copy: func(offset: option<gpu-size64>, size: option<gpu-size64>) -> result<list<u8>, get-mapped-range-error>;
unmap: func() -> result<_, unmap-error>;
destroy: func();
Expand Down Expand Up @@ -341,16 +341,16 @@ interface webgpu {
create-shader-module: func(descriptor: gpu-shader-module-descriptor) -> gpu-shader-module;
create-compute-pipeline: func(descriptor: gpu-compute-pipeline-descriptor) -> gpu-compute-pipeline;
create-render-pipeline: func(descriptor: gpu-render-pipeline-descriptor) -> gpu-render-pipeline;
create-compute-pipeline-async: func(descriptor: gpu-compute-pipeline-descriptor) -> future<result<gpu-compute-pipeline, create-pipeline-error>>;
create-render-pipeline-async: func(descriptor: gpu-render-pipeline-descriptor) -> future<result<gpu-render-pipeline, create-pipeline-error>>;
create-compute-pipeline-async: async func(descriptor: gpu-compute-pipeline-descriptor) -> result<gpu-compute-pipeline, create-pipeline-error>;
create-render-pipeline-async: async func(descriptor: gpu-render-pipeline-descriptor) -> result<gpu-render-pipeline, create-pipeline-error>;
create-command-encoder: func(descriptor: option<gpu-command-encoder-descriptor>) -> gpu-command-encoder;
create-render-bundle-encoder: func(descriptor: gpu-render-bundle-encoder-descriptor) -> gpu-render-bundle-encoder;
create-query-set: func(descriptor: gpu-query-set-descriptor) -> result<gpu-query-set, create-query-set-error>;
label: func() -> string;
set-label: func(label: string);
lost: func() -> future<gpu-device-lost-info>;
push-error-scope: func(filter: gpu-error-filter);
pop-error-scope: func() -> future<result<option<gpu-error>, pop-error-scope-error>>;
pop-error-scope: async func() -> result<option<gpu-error>, pop-error-scope-error>;
on-uncaptured-error: func() -> stream<gpu-error>;
}
record gpu-device-descriptor {
Expand Down Expand Up @@ -512,7 +512,7 @@ interface webgpu {
}
resource gpu-queue {
submit: func(command-buffers: list<borrow<gpu-command-buffer>>);
on-submitted-work-done: func() -> future;
on-submitted-work-done: async func();
write-buffer-with-copy: func(buffer: borrow<gpu-buffer>, buffer-offset: gpu-size64, data: list<u8>, data-offset: option<gpu-size64>, size: option<gpu-size64>) -> result<_, write-buffer-error>;
write-texture-with-copy: func(destination: gpu-texel-copy-texture-info, data: list<u8>, data-layout: gpu-texel-copy-buffer-layout, size: gpu-extent3-d);
label: func() -> string;
Expand Down Expand Up @@ -656,7 +656,7 @@ interface webgpu {
label: option<string>,
}
resource gpu-shader-module {
get-compilation-info: func() -> future<gpu-compilation-info>;
get-compilation-info: async func() -> gpu-compilation-info;
label: func() -> string;
set-label: func(label: string);
}
Expand Down
Loading