mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-22 06:44:14 +00:00
update deno and spec (#4143)
Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
This commit is contained in:
Leo Kettmeir
GitHub
parent
d2f8bd0eed
commit
d0a7f46e3a
2
.github/workflows/cts.yml
vendored
2
.github/workflows/cts.yml
vendored
@ -75,7 +75,7 @@ jobs:
|
|||||||
- name: disable debug
|
- name: disable debug
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
mkdir wgpu/.cargo
|
mkdir -p wgpu/.cargo
|
||||||
echo """[profile.dev]
|
echo """[profile.dev]
|
||||||
debug = 1" > wgpu/.cargo/config.toml
|
debug = 1" > wgpu/.cargo/config.toml
|
||||||
|
|
||||||
|
|||||||
182
Cargo.lock
generated
182
Cargo.lock
generated
@ -159,9 +159,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-trait"
|
name = "async-trait"
|
||||||
version = "0.1.71"
|
version = "0.1.73"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
|
checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@ -184,7 +184,7 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"miniz_oxide 0.7.1",
|
"miniz_oxide",
|
||||||
"object",
|
"object",
|
||||||
"rustc-demangle",
|
"rustc-demangle",
|
||||||
]
|
]
|
||||||
@ -626,25 +626,49 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_console"
|
name = "deno-proc-macro-rules"
|
||||||
version = "0.106.0"
|
version = "0.3.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "86e7857cc8b133aed57e5f1dcfac6c0db308e70540727dfe0637af5281299758"
|
checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f"
|
||||||
|
dependencies = [
|
||||||
|
"deno-proc-macro-rules-macros",
|
||||||
|
"proc-macro2",
|
||||||
|
"syn 2.0.28",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "deno-proc-macro-rules-macros"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435"
|
||||||
|
dependencies = [
|
||||||
|
"once_cell",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.28",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "deno_console"
|
||||||
|
version = "0.119.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "106305c29d87aaa8030a472486074ba780dccc75c909a4f55bbac4376d8425a3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deno_core",
|
"deno_core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_core"
|
name = "deno_core"
|
||||||
version = "0.188.0"
|
version = "0.214.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "83573c39d4045b6c2e056a2ad87e49c43e57b64b54ee4381894c030390fa1f76"
|
checksum = "be0af76effe9a766f7c9a253171ab10b9adfaf4b10c6eb0b9f005f9dd0ba2948"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
"deno_ops",
|
"deno_ops",
|
||||||
|
"deno_unsync",
|
||||||
"futures",
|
"futures",
|
||||||
"indexmap 1.9.3",
|
"indexmap 2.0.0",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@ -662,10 +686,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_ops"
|
name = "deno_ops"
|
||||||
version = "0.66.0"
|
version = "0.90.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0446caff6cdb14fbf6c5e85fc042e3102aa6c618fa19a2ef47b67fc2657c0e8e"
|
checksum = "568aba570695e05f08c2181bcd6cd3579684af42f489b9ae42712348044b4af7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"deno-proc-macro-rules",
|
||||||
"lazy-regex",
|
"lazy-regex",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"pmutil",
|
"pmutil",
|
||||||
@ -673,32 +698,45 @@ dependencies = [
|
|||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"regex",
|
"regex",
|
||||||
"syn 1.0.109",
|
"strum",
|
||||||
|
"strum_macros",
|
||||||
|
"syn 2.0.28",
|
||||||
|
"thiserror",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "deno_unsync"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0720e562455d6374a5292baec3fc895ed8bfed0937428e3245e50979924e5b15"
|
||||||
|
dependencies = [
|
||||||
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_url"
|
name = "deno_url"
|
||||||
version = "0.106.0"
|
version = "0.119.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eae0fa17e1fc70d8bb1f59d64a952b790afd774d3499524d7a760812eec07486"
|
checksum = "df3885daa41f0236c622801aa7e7b6efdff1e253fbaa941eb5087ec3e7339114"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deno_core",
|
"deno_core",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_repr",
|
|
||||||
"urlpattern",
|
"urlpattern",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_web"
|
name = "deno_web"
|
||||||
version = "0.137.0"
|
version = "0.150.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a10df5503ffec0b1a59541e2587f84873676d714e5d935ecc4d2792685827198"
|
checksum = "227c8b22e230c85a7cbc5632a6ce81959d277deabd2dfc015dda332c33b1a20d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64-simd",
|
"base64-simd",
|
||||||
|
"bytes",
|
||||||
"deno_core",
|
"deno_core",
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
"futures",
|
||||||
"serde",
|
"serde",
|
||||||
"tokio",
|
"tokio",
|
||||||
"uuid",
|
"uuid",
|
||||||
@ -714,14 +752,15 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"tokio",
|
"tokio",
|
||||||
"wgpu-core",
|
"wgpu-core",
|
||||||
|
"wgpu-hal",
|
||||||
"wgpu-types",
|
"wgpu-types",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deno_webidl"
|
name = "deno_webidl"
|
||||||
version = "0.106.0"
|
version = "0.119.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "980a92f4619ace414abd464ad417ae362c7be05020009dfd4c4f1794ed21c71f"
|
checksum = "26983f124cb3d641d940eb2636a103f4907f02b4cd3b52e3acd8365f20a33c08"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deno_core",
|
"deno_core",
|
||||||
]
|
]
|
||||||
@ -782,9 +821,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "encoding_rs"
|
name = "encoding_rs"
|
||||||
version = "0.8.31"
|
version = "0.8.33"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
|
checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
@ -877,12 +916,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "flate2"
|
name = "flate2"
|
||||||
version = "1.0.24"
|
version = "1.0.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
|
checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"miniz_oxide 0.5.4",
|
"libz-ng-sys",
|
||||||
|
"miniz_oxide",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1290,6 +1330,12 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "heck"
|
||||||
|
version = "0.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hermit-abi"
|
name = "hermit-abi"
|
||||||
version = "0.3.2"
|
version = "0.3.2"
|
||||||
@ -1437,9 +1483,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy-regex"
|
name = "lazy-regex"
|
||||||
version = "2.5.0"
|
version = "3.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4"
|
checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy-regex-proc_macros",
|
"lazy-regex-proc_macros",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@ -1448,14 +1494,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy-regex-proc_macros"
|
name = "lazy-regex-proc_macros"
|
||||||
version = "2.4.1"
|
version = "3.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22"
|
checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"regex",
|
"regex",
|
||||||
"syn 1.0.109",
|
"syn 2.0.28",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1490,6 +1536,16 @@ dependencies = [
|
|||||||
"windows-sys 0.48.0",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libz-ng-sys"
|
||||||
|
version = "1.1.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
|
||||||
|
dependencies = [
|
||||||
|
"cmake",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linux-raw-sys"
|
name = "linux-raw-sys"
|
||||||
version = "0.4.3"
|
version = "0.4.3"
|
||||||
@ -1568,15 +1624,6 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "miniz_oxide"
|
|
||||||
version = "0.5.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
|
|
||||||
dependencies = [
|
|
||||||
"adler",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.7.1"
|
version = "0.7.1"
|
||||||
@ -2056,13 +2103,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pmutil"
|
name = "pmutil"
|
||||||
version = "0.5.3"
|
version = "0.6.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004"
|
checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 1.0.109",
|
"syn 2.0.28",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2075,7 +2122,7 @@ dependencies = [
|
|||||||
"crc32fast",
|
"crc32fast",
|
||||||
"fdeflate",
|
"fdeflate",
|
||||||
"flate2",
|
"flate2",
|
||||||
"miniz_oxide 0.7.1",
|
"miniz_oxide",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2324,6 +2371,12 @@ dependencies = [
|
|||||||
"windows-sys 0.48.0",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustversion"
|
||||||
|
version = "1.0.14"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ryu"
|
name = "ryu"
|
||||||
version = "1.0.15"
|
version = "1.0.15"
|
||||||
@ -2438,22 +2491,11 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_repr"
|
|
||||||
version = "0.1.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_v8"
|
name = "serde_v8"
|
||||||
version = "0.99.0"
|
version = "0.123.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "abcb15f793aba70da4d29b2015c9b70943bd7f6970cab7963fcf83c19bbab1c9"
|
checksum = "cc3e1c4d2b20f6983e86077c66b25b8d768f2e102e09659af2af034ac47ae709"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"derive_more",
|
"derive_more",
|
||||||
@ -2566,9 +2608,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sourcemap"
|
name = "sourcemap"
|
||||||
version = "6.3.0"
|
version = "7.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8df03d85f2767c45e61b4453eb6144153c80399e4fdd6407a6d16cb87cc0347"
|
checksum = "dbecc42a2b6131acc3bf9a25c9fe4161dba438eb52131bba83c5d781b5b70be3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"data-encoding",
|
"data-encoding",
|
||||||
"debugid",
|
"debugid",
|
||||||
@ -2608,6 +2650,28 @@ version = "0.10.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strum"
|
||||||
|
version = "0.25.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
|
||||||
|
dependencies = [
|
||||||
|
"strum_macros",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strum_macros"
|
||||||
|
version = "0.25.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
|
||||||
|
dependencies = [
|
||||||
|
"heck",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"rustversion",
|
||||||
|
"syn 2.0.28",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.109"
|
version = "1.0.109"
|
||||||
@ -2894,9 +2958,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "v8"
|
name = "v8"
|
||||||
version = "0.72.0"
|
version = "0.76.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d5c1d09f66ab7f69e36211c5488d47f683fef6b65b83a627cfd75ed9cef254e6"
|
checksum = "9d4e8ae7ef8b4e852e728e343cb6bb471a0424dfefa22585ea0c14a61252d73f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 1.3.2",
|
"bitflags 1.3.2",
|
||||||
"fslock",
|
"fslock",
|
||||||
|
|||||||
10
Cargo.toml
10
Cargo.toml
@ -129,11 +129,11 @@ wasm-bindgen-test = "0.3"
|
|||||||
web-sys = "0.3.64"
|
web-sys = "0.3.64"
|
||||||
|
|
||||||
# deno dependencies
|
# deno dependencies
|
||||||
deno_console = "0.106.0"
|
deno_console = "0.119.0"
|
||||||
deno_core = "0.188.0"
|
deno_core = "0.214.0"
|
||||||
deno_url = "0.106.0"
|
deno_url = "0.119.0"
|
||||||
deno_web = "0.137.0"
|
deno_web = "0.150.0"
|
||||||
deno_webidl = "0.106.0"
|
deno_webidl = "0.119.0"
|
||||||
deno_webgpu = { path = "./deno_webgpu" }
|
deno_webgpu = { path = "./deno_webgpu" }
|
||||||
tokio = "1.32.0"
|
tokio = "1.32.0"
|
||||||
termcolor = "1.3.0"
|
termcolor = "1.3.0"
|
||||||
|
|||||||
@ -49,13 +49,14 @@ const size = new Uint32Array(numbers).byteLength;
|
|||||||
|
|
||||||
const stagingBuffer = device.createBuffer({
|
const stagingBuffer = device.createBuffer({
|
||||||
size: size,
|
size: size,
|
||||||
usage: 1 | 8,
|
usage: GPUBufferUsage.MAP_READ | GPUBufferUsage.COPY_DST,
|
||||||
});
|
});
|
||||||
|
|
||||||
const storageBuffer = device.createBuffer({
|
const storageBuffer = device.createBuffer({
|
||||||
label: "Storage Buffer",
|
label: "Storage Buffer",
|
||||||
size: size,
|
size: size,
|
||||||
usage: 0x80 | 8 | 4,
|
usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST |
|
||||||
|
GPUBufferUsage.COPY_SRC,
|
||||||
mappedAtCreation: true,
|
mappedAtCreation: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
a44186d9fa1d5babdb4a198e8ef04cf0d7035ebb
|
7ea73ba6f44c9f6fedfffc06f14c73ea9f2eaa11
|
||||||
|
|||||||
105
cts_runner/src/bootstrap.js
vendored
105
cts_runner/src/bootstrap.js
vendored
@ -42,6 +42,64 @@ import "ext:deno_web/14_compression.js";
|
|||||||
|
|
||||||
let globalThis_;
|
let globalThis_;
|
||||||
|
|
||||||
|
const { BadResource, Interrupted } = core;
|
||||||
|
|
||||||
|
class NotFound extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "NotFound";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class BrokenPipe extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "BrokenPipe";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AlreadyExists extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "AlreadyExists";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class InvalidData extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "InvalidData";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TimedOut extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "TimedOut";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class WriteZero extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "WriteZero";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class UnexpectedEof extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "UnexpectedEof";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class NotSupported extends Error {
|
||||||
|
constructor(msg) {
|
||||||
|
super(msg);
|
||||||
|
this.name = "NotSupported";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const util = {
|
const util = {
|
||||||
writable(value) {
|
writable(value) {
|
||||||
return {
|
return {
|
||||||
@ -88,7 +146,7 @@ const NavigatorPrototype = Navigator.prototype;
|
|||||||
|
|
||||||
const navigator = webidl.createBranded(Navigator);
|
const navigator = webidl.createBranded(Navigator);
|
||||||
|
|
||||||
ObjectDefineProperties(Navigator.prototype, {
|
ObjectDefineProperties(NavigatorPrototype, {
|
||||||
gpu: {
|
gpu: {
|
||||||
configurable: true,
|
configurable: true,
|
||||||
enumerable: true,
|
enumerable: true,
|
||||||
@ -108,6 +166,7 @@ const windowOrWorkerGlobalScope = {
|
|||||||
EventTarget: util.nonEnumerable(event.EventTarget),
|
EventTarget: util.nonEnumerable(event.EventTarget),
|
||||||
Navigator: util.nonEnumerable(Navigator),
|
Navigator: util.nonEnumerable(Navigator),
|
||||||
navigator: util.getterOnly(() => navigator),
|
navigator: util.getterOnly(() => navigator),
|
||||||
|
MessageEvent: util.nonEnumerable(event.MessageEvent),
|
||||||
Performance: util.nonEnumerable(performance.Performance),
|
Performance: util.nonEnumerable(performance.Performance),
|
||||||
PerformanceEntry: util.nonEnumerable(performance.PerformanceEntry),
|
PerformanceEntry: util.nonEnumerable(performance.PerformanceEntry),
|
||||||
PerformanceMark: util.nonEnumerable(performance.PerformanceMark),
|
PerformanceMark: util.nonEnumerable(performance.PerformanceMark),
|
||||||
@ -127,15 +186,17 @@ const windowOrWorkerGlobalScope = {
|
|||||||
|
|
||||||
GPU: util.nonEnumerable(webgpu.GPU),
|
GPU: util.nonEnumerable(webgpu.GPU),
|
||||||
GPUAdapter: util.nonEnumerable(webgpu.GPUAdapter),
|
GPUAdapter: util.nonEnumerable(webgpu.GPUAdapter),
|
||||||
GPUAdapterLimits: util.nonEnumerable(webgpu.GPUAdapterLimits),
|
GPUAdapterInfo: util.nonEnumerable(webgpu.GPUAdapterInfo),
|
||||||
|
GPUSupportedLimits: util.nonEnumerable(webgpu.GPUSupportedLimits),
|
||||||
GPUSupportedFeatures: util.nonEnumerable(webgpu.GPUSupportedFeatures),
|
GPUSupportedFeatures: util.nonEnumerable(webgpu.GPUSupportedFeatures),
|
||||||
|
GPUDeviceLostInfo: util.nonEnumerable(webgpu.GPUDeviceLostInfo),
|
||||||
GPUDevice: util.nonEnumerable(webgpu.GPUDevice),
|
GPUDevice: util.nonEnumerable(webgpu.GPUDevice),
|
||||||
GPUQueue: util.nonEnumerable(webgpu.GPUQueue),
|
GPUQueue: util.nonEnumerable(webgpu.GPUQueue),
|
||||||
GPUBuffer: util.nonEnumerable(webgpu.GPUBuffer),
|
GPUBuffer: util.nonEnumerable(webgpu.GPUBuffer),
|
||||||
GPUBufferUsage: util.nonEnumerable(webgpu.GPUBufferUsage),
|
GPUBufferUsage: util.nonEnumerable(webgpu.GPUBufferUsage),
|
||||||
GPUMapMode: util.nonEnumerable(webgpu.GPUMapMode),
|
GPUMapMode: util.nonEnumerable(webgpu.GPUMapMode),
|
||||||
GPUTexture: util.nonEnumerable(webgpu.GPUTexture),
|
|
||||||
GPUTextureUsage: util.nonEnumerable(webgpu.GPUTextureUsage),
|
GPUTextureUsage: util.nonEnumerable(webgpu.GPUTextureUsage),
|
||||||
|
GPUTexture: util.nonEnumerable(webgpu.GPUTexture),
|
||||||
GPUTextureView: util.nonEnumerable(webgpu.GPUTextureView),
|
GPUTextureView: util.nonEnumerable(webgpu.GPUTextureView),
|
||||||
GPUSampler: util.nonEnumerable(webgpu.GPUSampler),
|
GPUSampler: util.nonEnumerable(webgpu.GPUSampler),
|
||||||
GPUBindGroupLayout: util.nonEnumerable(webgpu.GPUBindGroupLayout),
|
GPUBindGroupLayout: util.nonEnumerable(webgpu.GPUBindGroupLayout),
|
||||||
@ -153,8 +214,9 @@ const windowOrWorkerGlobalScope = {
|
|||||||
GPURenderBundleEncoder: util.nonEnumerable(webgpu.GPURenderBundleEncoder),
|
GPURenderBundleEncoder: util.nonEnumerable(webgpu.GPURenderBundleEncoder),
|
||||||
GPURenderBundle: util.nonEnumerable(webgpu.GPURenderBundle),
|
GPURenderBundle: util.nonEnumerable(webgpu.GPURenderBundle),
|
||||||
GPUQuerySet: util.nonEnumerable(webgpu.GPUQuerySet),
|
GPUQuerySet: util.nonEnumerable(webgpu.GPUQuerySet),
|
||||||
GPUOutOfMemoryError: util.nonEnumerable(webgpu.GPUOutOfMemoryError),
|
GPUError: util.nonEnumerable(webgpu.GPUError),
|
||||||
GPUValidationError: util.nonEnumerable(webgpu.GPUValidationError),
|
GPUValidationError: util.nonEnumerable(webgpu.GPUValidationError),
|
||||||
|
GPUOutOfMemoryError: util.nonEnumerable(webgpu.GPUOutOfMemoryError),
|
||||||
};
|
};
|
||||||
|
|
||||||
windowOrWorkerGlobalScope.console.enumerable = false;
|
windowOrWorkerGlobalScope.console.enumerable = false;
|
||||||
@ -167,27 +229,54 @@ const mainRuntimeGlobalProperties = {
|
|||||||
|
|
||||||
const denoNs = {
|
const denoNs = {
|
||||||
exit(code) {
|
exit(code) {
|
||||||
core.opSync("op_exit", code);
|
core.ops.op_exit(code);
|
||||||
},
|
},
|
||||||
readFileSync(path) {
|
readFileSync(path) {
|
||||||
return core.opSync("op_read_file_sync", pathFromURL(path));
|
return core.ops.op_read_file_sync(pathFromURL(path));
|
||||||
},
|
},
|
||||||
readTextFileSync(path) {
|
readTextFileSync(path) {
|
||||||
const buf = core.opSync("op_read_file_sync", pathFromURL(path));
|
const buf = core.ops.op_read_file_sync(pathFromURL(path));
|
||||||
const decoder = new TextDecoder();
|
const decoder = new TextDecoder();
|
||||||
return decoder.decode(buf);
|
return decoder.decode(buf);
|
||||||
},
|
},
|
||||||
writeFileSync(path, buf) {
|
writeFileSync(path, buf) {
|
||||||
return core.opSync("op_write_file_sync", pathFromURL(path), buf);
|
return core.ops.op_write_file_sync(pathFromURL(path), buf);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
core.registerErrorClass("NotFound", NotFound);
|
||||||
|
core.registerErrorClass("AlreadyExists", AlreadyExists);
|
||||||
|
core.registerErrorClass("InvalidData", InvalidData);
|
||||||
|
core.registerErrorClass("TimedOut", TimedOut);
|
||||||
|
core.registerErrorClass("Interrupted", Interrupted);
|
||||||
|
core.registerErrorClass("WriteZero", WriteZero);
|
||||||
|
core.registerErrorClass("UnexpectedEof", UnexpectedEof);
|
||||||
|
core.registerErrorClass("BadResource", BadResource);
|
||||||
|
core.registerErrorClass("NotSupported", NotSupported);
|
||||||
core.registerErrorBuilder(
|
core.registerErrorBuilder(
|
||||||
"DOMExceptionOperationError",
|
"DOMExceptionOperationError",
|
||||||
function DOMExceptionOperationError(msg) {
|
function DOMExceptionOperationError(msg) {
|
||||||
return new DOMException(msg, "OperationError");
|
return new DOMException(msg, "OperationError");
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
core.registerErrorBuilder(
|
||||||
|
"DOMExceptionAbortError",
|
||||||
|
function DOMExceptionAbortError(msg) {
|
||||||
|
return new domException.DOMException(msg, "AbortError");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
core.registerErrorBuilder(
|
||||||
|
"DOMExceptionInvalidCharacterError",
|
||||||
|
function DOMExceptionInvalidCharacterError(msg) {
|
||||||
|
return new domException.DOMException(msg, "InvalidCharacterError");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
core.registerErrorBuilder(
|
||||||
|
"DOMExceptionDataError",
|
||||||
|
function DOMExceptionDataError(msg) {
|
||||||
|
return new domException.DOMException(msg, "DataError");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
let hasBootstrapped = false;
|
let hasBootstrapped = false;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
mod native {
|
mod native {
|
||||||
|
use std::sync::Arc;
|
||||||
use std::{
|
use std::{
|
||||||
env, fmt,
|
env, fmt,
|
||||||
io::{Read, Write},
|
io::{Read, Write},
|
||||||
@ -8,13 +9,12 @@ mod native {
|
|||||||
|
|
||||||
use deno_core::anyhow::anyhow;
|
use deno_core::anyhow::anyhow;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::resolve_url_or_path;
|
use deno_core::resolve_url_or_path;
|
||||||
use deno_core::serde_json::json;
|
use deno_core::serde_json::json;
|
||||||
use deno_core::v8;
|
use deno_core::v8;
|
||||||
use deno_core::JsRuntime;
|
use deno_core::JsRuntime;
|
||||||
use deno_core::RuntimeOptions;
|
use deno_core::RuntimeOptions;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use deno_web::BlobStore;
|
use deno_web::BlobStore;
|
||||||
use termcolor::Ansi;
|
use termcolor::Ansi;
|
||||||
use termcolor::Color::Red;
|
use termcolor::Color::Red;
|
||||||
@ -36,7 +36,10 @@ mod native {
|
|||||||
deno_webidl::deno_webidl::init_ops_and_esm(),
|
deno_webidl::deno_webidl::init_ops_and_esm(),
|
||||||
deno_console::deno_console::init_ops_and_esm(),
|
deno_console::deno_console::init_ops_and_esm(),
|
||||||
deno_url::deno_url::init_ops_and_esm(),
|
deno_url::deno_url::init_ops_and_esm(),
|
||||||
deno_web::deno_web::init_ops_and_esm::<Permissions>(BlobStore::default(), None),
|
deno_web::deno_web::init_ops_and_esm::<Permissions>(
|
||||||
|
Arc::new(BlobStore::default()),
|
||||||
|
None,
|
||||||
|
),
|
||||||
deno_webgpu::deno_webgpu::init_ops_and_esm(true),
|
deno_webgpu::deno_webgpu::init_ops_and_esm(true),
|
||||||
cts_runner::init_ops_and_esm(),
|
cts_runner::init_ops_and_esm(),
|
||||||
],
|
],
|
||||||
@ -47,7 +50,7 @@ mod native {
|
|||||||
let cfg = json!({"args": args, "cwd": env::current_dir().unwrap().to_string_lossy() });
|
let cfg = json!({"args": args, "cwd": env::current_dir().unwrap().to_string_lossy() });
|
||||||
|
|
||||||
{
|
{
|
||||||
let context = isolate.global_context();
|
let context = isolate.main_context();
|
||||||
let scope = &mut isolate.handle_scope();
|
let scope = &mut isolate.handle_scope();
|
||||||
let context_local = v8::Local::new(scope, context);
|
let context_local = v8::Local::new(scope, context);
|
||||||
let global_obj = context_local.global(scope);
|
let global_obj = context_local.global(scope);
|
||||||
@ -56,7 +59,6 @@ mod native {
|
|||||||
let bootstrap_fn = v8::Local::<v8::Function>::try_from(bootstrap_fn).unwrap();
|
let bootstrap_fn = v8::Local::<v8::Function>::try_from(bootstrap_fn).unwrap();
|
||||||
|
|
||||||
let options_v8 = deno_core::serde_v8::to_v8(scope, cfg).unwrap();
|
let options_v8 = deno_core::serde_v8::to_v8(scope, cfg).unwrap();
|
||||||
let bootstrap_fn = v8::Local::new(scope, bootstrap_fn);
|
|
||||||
let undefined = v8::undefined(scope);
|
let undefined = v8::undefined(scope);
|
||||||
bootstrap_fn
|
bootstrap_fn
|
||||||
.call(scope, undefined.into(), &[options_v8])
|
.call(scope, undefined.into(), &[options_v8])
|
||||||
@ -86,28 +88,29 @@ mod native {
|
|||||||
deps = [deno_webidl, deno_web],
|
deps = [deno_webidl, deno_web],
|
||||||
ops = [op_exit, op_read_file_sync, op_write_file_sync],
|
ops = [op_exit, op_read_file_sync, op_write_file_sync],
|
||||||
esm_entry_point = "ext:cts_runner/bootstrap.js",
|
esm_entry_point = "ext:cts_runner/bootstrap.js",
|
||||||
esm = ["bootstrap.js"],
|
esm = ["src/bootstrap.js"],
|
||||||
);
|
);
|
||||||
|
|
||||||
#[op]
|
#[op2(fast)]
|
||||||
fn op_exit(code: i32) -> Result<(), AnyError> {
|
fn op_exit(code: i32) -> Result<(), AnyError> {
|
||||||
std::process::exit(code)
|
std::process::exit(code)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
fn op_read_file_sync(path: String) -> Result<ZeroCopyBuf, AnyError> {
|
#[buffer]
|
||||||
let path = std::path::Path::new(&path);
|
fn op_read_file_sync(#[string] path: &str) -> Result<Vec<u8>, AnyError> {
|
||||||
|
let path = std::path::Path::new(path);
|
||||||
let mut file = std::fs::File::open(path)?;
|
let mut file = std::fs::File::open(path)?;
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
file.read_to_end(&mut buf)?;
|
file.read_to_end(&mut buf)?;
|
||||||
Ok(ZeroCopyBuf::from(buf))
|
Ok(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(fast)]
|
||||||
fn op_write_file_sync(path: String, buf: ZeroCopyBuf) -> Result<(), AnyError> {
|
fn op_write_file_sync(#[string] path: &str, #[buffer] buf: &[u8]) -> Result<(), AnyError> {
|
||||||
let path = std::path::Path::new(&path);
|
let path = std::path::Path::new(path);
|
||||||
let mut file = std::fs::File::create(path)?;
|
let mut file = std::fs::File::create(path)?;
|
||||||
file.write_all(&buf)?;
|
file.write_all(buf)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
unittests:*
|
unittests:*
|
||||||
webgpu:api,operation,command_buffer,basic:*
|
webgpu:api,operation,command_buffer,basic:*
|
||||||
webgpu:api,operation,compute,basic:*
|
webgpu:api,operation,compute,basic:*
|
||||||
//FAIL: webgpu:api,validation,queue,copyToTexture,ImageBitmap:destination_texture,format:format="stencil8";*'
|
|
||||||
webgpu:api,operation,rendering,basic:clear:*
|
webgpu:api,operation,rendering,basic:clear:*
|
||||||
webgpu:api,operation,rendering,basic:fullscreen_quad:*
|
webgpu:api,operation,rendering,basic:fullscreen_quad:*
|
||||||
//HANG: webgpu:api,operation,rendering,basic:large_draw:*
|
//FAIL: webgpu:api,operation,rendering,basic:large_draw:*
|
||||||
webgpu:api,operation,rendering,blending:*
|
webgpu:api,operation,rendering,blending:*
|
||||||
webgpu:api,operation,rendering,blending:GPUBlendComponent:*
|
webgpu:api,operation,rendering,blending:GPUBlendComponent:*
|
||||||
//FAIL: webgpu:api,operation,rendering,depth:*
|
webgpu:api,operation,rendering,depth:*
|
||||||
//FAIL: webgpu:api,operation,rendering,draw:*
|
webgpu:api,operation,rendering,draw:*
|
||||||
|
|||||||
@ -140,11 +140,15 @@ function normalizeGPUExtent3D(data) {
|
|||||||
if (ArrayIsArray(data)) {
|
if (ArrayIsArray(data)) {
|
||||||
return {
|
return {
|
||||||
width: data[0],
|
width: data[0],
|
||||||
height: data[1],
|
height: data[1] ?? 1,
|
||||||
depthOrArrayLayers: data[2],
|
depthOrArrayLayers: data[2] ?? 1,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
return data;
|
return {
|
||||||
|
width: data.width,
|
||||||
|
height: data.height ?? 1,
|
||||||
|
depthOrArrayLayers: data.depthOrArrayLayers ?? 1,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1019,13 +1023,13 @@ class GPUDevice extends EventTarget {
|
|||||||
for (let i = 0; i < descriptor.entries.length; ++i) {
|
for (let i = 0; i < descriptor.entries.length; ++i) {
|
||||||
const entry = descriptor.entries[i];
|
const entry = descriptor.entries[i];
|
||||||
|
|
||||||
let i = 0;
|
let j = 0;
|
||||||
if (entry.buffer) i++;
|
if (entry.buffer) j++;
|
||||||
if (entry.sampler) i++;
|
if (entry.sampler) j++;
|
||||||
if (entry.texture) i++;
|
if (entry.texture) j++;
|
||||||
if (entry.storageTexture) i++;
|
if (entry.storageTexture) j++;
|
||||||
|
|
||||||
if (i !== 1) {
|
if (j !== 1) {
|
||||||
throw new Error(); // TODO(@crowlKats): correct error
|
throw new Error(); // TODO(@crowlKats): correct error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2839,11 +2843,35 @@ class GPUCommandEncoder {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const occlusionQuerySet = assertResource(
|
||||||
|
descriptor.occlusionQuerySet,
|
||||||
|
{
|
||||||
|
prefix,
|
||||||
|
context: "occlusionQuerySet",
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
let timestampWrites = null;
|
||||||
|
if (descriptor.timestampWrites) {
|
||||||
|
const querySet = assertResource(descriptor.querySet, {
|
||||||
|
prefix,
|
||||||
|
context: "querySet",
|
||||||
|
});
|
||||||
|
|
||||||
|
timestampWrites = {
|
||||||
|
querySet,
|
||||||
|
beginningOfPassWriteIndex: descriptor.beginningOfPassWriteIndex,
|
||||||
|
endOfPassWriteIndex: descriptor.endOfPassWriteIndex,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const { rid } = ops.op_webgpu_command_encoder_begin_render_pass(
|
const { rid } = ops.op_webgpu_command_encoder_begin_render_pass(
|
||||||
commandEncoderRid,
|
commandEncoderRid,
|
||||||
descriptor.label,
|
descriptor.label,
|
||||||
colorAttachments,
|
colorAttachments,
|
||||||
depthStencilAttachment,
|
depthStencilAttachment,
|
||||||
|
occlusionQuerySet,
|
||||||
|
timestampWrites,
|
||||||
);
|
);
|
||||||
|
|
||||||
const renderPassEncoder = createGPURenderPassEncoder(
|
const renderPassEncoder = createGPURenderPassEncoder(
|
||||||
@ -2873,9 +2901,24 @@ class GPUCommandEncoder {
|
|||||||
context: "this",
|
context: "this",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let timestampWrites = null;
|
||||||
|
if (descriptor.timestampWrites) {
|
||||||
|
const querySet = assertResource(descriptor.querySet, {
|
||||||
|
prefix,
|
||||||
|
context: "querySet",
|
||||||
|
});
|
||||||
|
|
||||||
|
timestampWrites = {
|
||||||
|
querySet,
|
||||||
|
beginningOfPassWriteIndex: descriptor.beginningOfPassWriteIndex,
|
||||||
|
endOfPassWriteIndex: descriptor.endOfPassWriteIndex,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const { rid } = ops.op_webgpu_command_encoder_begin_compute_pass(
|
const { rid } = ops.op_webgpu_command_encoder_begin_compute_pass(
|
||||||
commandEncoderRid,
|
commandEncoderRid,
|
||||||
descriptor.label,
|
descriptor.label,
|
||||||
|
timestampWrites,
|
||||||
);
|
);
|
||||||
|
|
||||||
const computePassEncoder = createGPUComputePassEncoder(
|
const computePassEncoder = createGPUComputePassEncoder(
|
||||||
@ -3591,51 +3634,17 @@ class GPURenderPassEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {GPUQuerySet} querySet
|
|
||||||
* @param {number} queryIndex
|
* @param {number} queryIndex
|
||||||
*/
|
*/
|
||||||
beginPipelineStatisticsQuery(querySet, queryIndex) {
|
beginOcclusionQuery(queryIndex) {
|
||||||
webidl.assertBranded(this, GPURenderPassEncoderPrototype);
|
webidl.assertBranded(this, GPURenderPassEncoderPrototype);
|
||||||
const prefix =
|
const prefix =
|
||||||
"Failed to execute 'beginPipelineStatisticsQuery' on 'GPURenderPassEncoder'";
|
"Failed to execute 'beginOcclusionQuery' on 'GPUComputePassEncoder'";
|
||||||
webidl.requiredArguments(arguments.length, 2, { prefix });
|
webidl.requiredArguments(arguments.length, 1, { prefix });
|
||||||
querySet = webidl.converters.GPUQuerySet(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
queryIndex = webidl.converters.GPUSize32(queryIndex, {
|
queryIndex = webidl.converters.GPUSize32(queryIndex, {
|
||||||
prefix,
|
|
||||||
context: "Argument 2",
|
|
||||||
});
|
|
||||||
const device = assertDevice(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
assertResource(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
const renderPassRid = assertResource(this, { prefix, context: "this" });
|
|
||||||
const querySetRid = assertResource(querySet, {
|
|
||||||
prefix,
|
prefix,
|
||||||
context: "Argument 1",
|
context: "Argument 1",
|
||||||
});
|
});
|
||||||
assertDeviceMatch(device, querySet, {
|
|
||||||
prefix,
|
|
||||||
resourceContext: "Argument 1",
|
|
||||||
selfContext: "this",
|
|
||||||
});
|
|
||||||
ops.op_webgpu_render_pass_begin_pipeline_statistics_query(
|
|
||||||
renderPassRid,
|
|
||||||
querySetRid,
|
|
||||||
queryIndex,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
endPipelineStatisticsQuery() {
|
|
||||||
webidl.assertBranded(this, GPURenderPassEncoderPrototype);
|
|
||||||
const prefix =
|
|
||||||
"Failed to execute 'endPipelineStatisticsQuery' on 'GPURenderPassEncoder'";
|
|
||||||
assertDevice(this[_encoder], {
|
assertDevice(this[_encoder], {
|
||||||
prefix,
|
prefix,
|
||||||
context: "encoder referenced by this",
|
context: "encoder referenced by this",
|
||||||
@ -3645,27 +3654,17 @@ class GPURenderPassEncoder {
|
|||||||
context: "encoder referenced by this",
|
context: "encoder referenced by this",
|
||||||
});
|
});
|
||||||
const renderPassRid = assertResource(this, { prefix, context: "this" });
|
const renderPassRid = assertResource(this, { prefix, context: "this" });
|
||||||
ops.op_webgpu_render_pass_end_pipeline_statistics_query(renderPassRid);
|
ops.op_webgpu_render_pass_begin_occlusion_query(
|
||||||
|
renderPassRid,
|
||||||
|
queryIndex,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
endOcclusionQuery() {
|
||||||
* @param {GPUQuerySet} querySet
|
|
||||||
* @param {number} queryIndex
|
|
||||||
*/
|
|
||||||
writeTimestamp(querySet, queryIndex) {
|
|
||||||
webidl.assertBranded(this, GPURenderPassEncoderPrototype);
|
webidl.assertBranded(this, GPURenderPassEncoderPrototype);
|
||||||
const prefix =
|
const prefix =
|
||||||
"Failed to execute 'writeTimestamp' on 'GPURenderPassEncoder'";
|
"Failed to execute 'endOcclusionQuery' on 'GPUComputePassEncoder'";
|
||||||
webidl.requiredArguments(arguments.length, 2, { prefix });
|
assertDevice(this[_encoder], {
|
||||||
querySet = webidl.converters.GPUQuerySet(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
queryIndex = webidl.converters.GPUSize32(queryIndex, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 2",
|
|
||||||
});
|
|
||||||
const device = assertDevice(this[_encoder], {
|
|
||||||
prefix,
|
prefix,
|
||||||
context: "encoder referenced by this",
|
context: "encoder referenced by this",
|
||||||
});
|
});
|
||||||
@ -3674,20 +3673,7 @@ class GPURenderPassEncoder {
|
|||||||
context: "encoder referenced by this",
|
context: "encoder referenced by this",
|
||||||
});
|
});
|
||||||
const renderPassRid = assertResource(this, { prefix, context: "this" });
|
const renderPassRid = assertResource(this, { prefix, context: "this" });
|
||||||
const querySetRid = assertResource(querySet, {
|
ops.op_webgpu_render_pass_end_occlusion_query(renderPassRid);
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
assertDeviceMatch(device, querySet, {
|
|
||||||
prefix,
|
|
||||||
resourceContext: "Argument 1",
|
|
||||||
selfContext: "this",
|
|
||||||
});
|
|
||||||
ops.op_webgpu_render_pass_write_timestamp(
|
|
||||||
renderPassRid,
|
|
||||||
querySetRid,
|
|
||||||
queryIndex,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -4346,106 +4332,6 @@ class GPUComputePassEncoder {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {GPUQuerySet} querySet
|
|
||||||
* @param {number} queryIndex
|
|
||||||
*/
|
|
||||||
beginPipelineStatisticsQuery(querySet, queryIndex) {
|
|
||||||
webidl.assertBranded(this, GPUComputePassEncoderPrototype);
|
|
||||||
const prefix =
|
|
||||||
"Failed to execute 'beginPipelineStatisticsQuery' on 'GPUComputePassEncoder'";
|
|
||||||
webidl.requiredArguments(arguments.length, 2, { prefix });
|
|
||||||
querySet = webidl.converters.GPUQuerySet(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
queryIndex = webidl.converters.GPUSize32(queryIndex, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 2",
|
|
||||||
});
|
|
||||||
const device = assertDevice(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
assertResource(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
const computePassRid = assertResource(this, { prefix, context: "this" });
|
|
||||||
const querySetRid = assertResource(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
assertDeviceMatch(device, querySet, {
|
|
||||||
prefix,
|
|
||||||
resourceContext: "Argument 1",
|
|
||||||
selfContext: "this",
|
|
||||||
});
|
|
||||||
ops.op_webgpu_compute_pass_begin_pipeline_statistics_query(
|
|
||||||
computePassRid,
|
|
||||||
querySetRid,
|
|
||||||
queryIndex,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
endPipelineStatisticsQuery() {
|
|
||||||
webidl.assertBranded(this, GPUComputePassEncoderPrototype);
|
|
||||||
const prefix =
|
|
||||||
"Failed to execute 'endPipelineStatisticsQuery' on 'GPUComputePassEncoder'";
|
|
||||||
assertDevice(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
assertResource(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
const computePassRid = assertResource(this, { prefix, context: "this" });
|
|
||||||
ops.op_webgpu_compute_pass_end_pipeline_statistics_query(computePassRid);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {GPUQuerySet} querySet
|
|
||||||
* @param {number} queryIndex
|
|
||||||
*/
|
|
||||||
writeTimestamp(querySet, queryIndex) {
|
|
||||||
webidl.assertBranded(this, GPUComputePassEncoderPrototype);
|
|
||||||
const prefix =
|
|
||||||
"Failed to execute 'writeTimestamp' on 'GPUComputePassEncoder'";
|
|
||||||
webidl.requiredArguments(arguments.length, 2, { prefix });
|
|
||||||
querySet = webidl.converters.GPUQuerySet(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
queryIndex = webidl.converters.GPUSize32(queryIndex, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 2",
|
|
||||||
});
|
|
||||||
const device = assertDevice(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
assertResource(this[_encoder], {
|
|
||||||
prefix,
|
|
||||||
context: "encoder referenced by this",
|
|
||||||
});
|
|
||||||
const computePassRid = assertResource(this, { prefix, context: "this" });
|
|
||||||
const querySetRid = assertResource(querySet, {
|
|
||||||
prefix,
|
|
||||||
context: "Argument 1",
|
|
||||||
});
|
|
||||||
assertDeviceMatch(device, querySet, {
|
|
||||||
prefix,
|
|
||||||
resourceContext: "Argument 1",
|
|
||||||
selfContext: "this",
|
|
||||||
});
|
|
||||||
ops.op_webgpu_compute_pass_write_timestamp(
|
|
||||||
computePassRid,
|
|
||||||
querySetRid,
|
|
||||||
queryIndex,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
end() {
|
end() {
|
||||||
webidl.assertBranded(this, GPUComputePassEncoderPrototype);
|
webidl.assertBranded(this, GPUComputePassEncoderPrototype);
|
||||||
const prefix = "Failed to execute 'end' on 'GPUComputePassEncoder'";
|
const prefix = "Failed to execute 'end' on 'GPUComputePassEncoder'";
|
||||||
@ -5205,7 +5091,7 @@ const GPUQuerySetPrototype = GPUQuerySet.prototype;
|
|||||||
// otherwise their converters might not be available yet.
|
// otherwise their converters might not be available yet.
|
||||||
// DICTIONARY: GPUObjectDescriptorBase
|
// DICTIONARY: GPUObjectDescriptorBase
|
||||||
const dictMembersGPUObjectDescriptorBase = [
|
const dictMembersGPUObjectDescriptorBase = [
|
||||||
{ key: "label", converter: webidl.converters["USVString"] },
|
{ key: "label", converter: webidl.converters["USVString"], defaultValue: "" },
|
||||||
];
|
];
|
||||||
webidl.converters["GPUObjectDescriptorBase"] = webidl
|
webidl.converters["GPUObjectDescriptorBase"] = webidl
|
||||||
.createDictionaryConverter(
|
.createDictionaryConverter(
|
||||||
@ -5285,7 +5171,7 @@ webidl.converters["GPUFeatureName"] = webidl.createEnumConverter(
|
|||||||
"texture-compression-astc-hdr",
|
"texture-compression-astc-hdr",
|
||||||
"texture-adapter-specific-format-features",
|
"texture-adapter-specific-format-features",
|
||||||
// api
|
// api
|
||||||
"pipeline-statistics-query",
|
//"pipeline-statistics-query",
|
||||||
"timestamp-query-inside-passes",
|
"timestamp-query-inside-passes",
|
||||||
"mappable-primary-buffers",
|
"mappable-primary-buffers",
|
||||||
"texture-binding-array",
|
"texture-binding-array",
|
||||||
@ -6862,8 +6748,33 @@ webidl.converters.GPUComputePassEncoder = webidl.createInterfaceConverter(
|
|||||||
GPUComputePassEncoder.prototype,
|
GPUComputePassEncoder.prototype,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// DICTIONARY: GPUComputePassTimestampWrites
|
||||||
|
webidl.converters["GPUComputePassTimestampWrites"] = webidl.createDictionaryConverter(
|
||||||
|
"GPUComputePassTimestampWrites",
|
||||||
|
[
|
||||||
|
{
|
||||||
|
key: "querySet",
|
||||||
|
converter: webidl.converters["GPUQuerySet"],
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "beginningOfPassWriteIndex",
|
||||||
|
converter: webidl.converters["GPUSize32"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "endOfPassWriteIndex",
|
||||||
|
converter: webidl.converters["GPUSize32"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
// DICTIONARY: GPUComputePassDescriptor
|
// DICTIONARY: GPUComputePassDescriptor
|
||||||
const dictMembersGPUComputePassDescriptor = [];
|
const dictMembersGPUComputePassDescriptor = [
|
||||||
|
{
|
||||||
|
key: "timestampWrites",
|
||||||
|
converter: webidl.converters["GPUComputePassTimestampWrites"],
|
||||||
|
},
|
||||||
|
];
|
||||||
webidl.converters["GPUComputePassDescriptor"] = webidl
|
webidl.converters["GPUComputePassDescriptor"] = webidl
|
||||||
.createDictionaryConverter(
|
.createDictionaryConverter(
|
||||||
"GPUComputePassDescriptor",
|
"GPUComputePassDescriptor",
|
||||||
@ -7005,6 +6916,26 @@ webidl.converters.GPUQuerySet = webidl.createInterfaceConverter(
|
|||||||
GPUQuerySet.prototype,
|
GPUQuerySet.prototype,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// DICTIONARY: GPURenderPassTimestampWrites
|
||||||
|
webidl.converters["GPURenderPassTimestampWrites"] = webidl.createDictionaryConverter(
|
||||||
|
"GPURenderPassTimestampWrites",
|
||||||
|
[
|
||||||
|
{
|
||||||
|
key: "querySet",
|
||||||
|
converter: webidl.converters["GPUQuerySet"],
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "beginningOfPassWriteIndex",
|
||||||
|
converter: webidl.converters["GPUSize32"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "endOfPassWriteIndex",
|
||||||
|
converter: webidl.converters["GPUSize32"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
// DICTIONARY: GPURenderPassDescriptor
|
// DICTIONARY: GPURenderPassDescriptor
|
||||||
const dictMembersGPURenderPassDescriptor = [
|
const dictMembersGPURenderPassDescriptor = [
|
||||||
{
|
{
|
||||||
@ -7020,6 +6951,14 @@ const dictMembersGPURenderPassDescriptor = [
|
|||||||
key: "depthStencilAttachment",
|
key: "depthStencilAttachment",
|
||||||
converter: webidl.converters["GPURenderPassDepthStencilAttachment"],
|
converter: webidl.converters["GPURenderPassDepthStencilAttachment"],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: "occlusionQuerySet",
|
||||||
|
converter: webidl.converters["GPUQuerySet"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "timestampWrites",
|
||||||
|
converter: webidl.converters["GPURenderPassTimestampWrites"],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
webidl.converters["GPURenderPassDescriptor"] = webidl
|
webidl.converters["GPURenderPassDescriptor"] = webidl
|
||||||
.createDictionaryConverter(
|
.createDictionaryConverter(
|
||||||
@ -7109,23 +7048,10 @@ webidl.converters["GPUQueryType"] = webidl.createEnumConverter(
|
|||||||
"GPUQueryType",
|
"GPUQueryType",
|
||||||
[
|
[
|
||||||
"occlusion",
|
"occlusion",
|
||||||
"pipeline-statistics",
|
|
||||||
"timestamp",
|
"timestamp",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
// ENUM: GPUPipelineStatisticName
|
|
||||||
webidl.converters["GPUPipelineStatisticName"] = webidl.createEnumConverter(
|
|
||||||
"GPUPipelineStatisticName",
|
|
||||||
[
|
|
||||||
"vertex-shader-invocations",
|
|
||||||
"clipper-invocations",
|
|
||||||
"clipper-primitives-out",
|
|
||||||
"fragment-shader-invocations",
|
|
||||||
"compute-shader-invocations",
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
// DICTIONARY: GPUQuerySetDescriptor
|
// DICTIONARY: GPUQuerySetDescriptor
|
||||||
const dictMembersGPUQuerySetDescriptor = [
|
const dictMembersGPUQuerySetDescriptor = [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -39,6 +39,10 @@ features = ["metal"]
|
|||||||
workspace = true
|
workspace = true
|
||||||
features = ["dx11", "dx12"]
|
features = ["dx11", "dx12"]
|
||||||
|
|
||||||
|
[target.'cfg(windows)'.dependencies.wgpu-hal]
|
||||||
|
path = "../wgpu-hal"
|
||||||
|
features = ["windows_rs"]
|
||||||
|
|
||||||
# We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows.
|
# We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows.
|
||||||
[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies.wgpu-core]
|
[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies.wgpu-core]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -176,12 +176,13 @@ impl From<GpuBindingType> for wgpu_types::BindingType {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_bind_group_layout(
|
pub fn op_webgpu_create_bind_group_layout(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
entries: Vec<GpuBindGroupLayoutEntry>,
|
#[serde] entries: Vec<GpuBindGroupLayoutEntry>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -202,7 +203,7 @@ pub fn op_webgpu_create_bind_group_layout(
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
let descriptor = wgpu_core::binding_model::BindGroupLayoutDescriptor {
|
let descriptor = wgpu_core::binding_model::BindGroupLayoutDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
entries: Cow::from(entries),
|
entries: Cow::from(entries),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -213,12 +214,13 @@ pub fn op_webgpu_create_bind_group_layout(
|
|||||||
) => state, WebGpuBindGroupLayout)
|
) => state, WebGpuBindGroupLayout)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_pipeline_layout(
|
pub fn op_webgpu_create_pipeline_layout(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
bind_group_layouts: Vec<u32>,
|
#[serde] bind_group_layouts: Vec<u32>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -235,7 +237,7 @@ pub fn op_webgpu_create_pipeline_layout(
|
|||||||
.collect::<Result<Vec<_>, AnyError>>()?;
|
.collect::<Result<Vec<_>, AnyError>>()?;
|
||||||
|
|
||||||
let descriptor = wgpu_core::binding_model::PipelineLayoutDescriptor {
|
let descriptor = wgpu_core::binding_model::PipelineLayoutDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
bind_group_layouts: Cow::from(bind_group_layouts),
|
bind_group_layouts: Cow::from(bind_group_layouts),
|
||||||
push_constant_ranges: Default::default(),
|
push_constant_ranges: Default::default(),
|
||||||
};
|
};
|
||||||
@ -257,13 +259,14 @@ pub struct GpuBindGroupEntry {
|
|||||||
size: Option<u64>,
|
size: Option<u64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_bind_group(
|
pub fn op_webgpu_create_bind_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
layout: ResourceId,
|
#[smi] layout: ResourceId,
|
||||||
entries: Vec<GpuBindGroupEntry>,
|
#[serde] entries: Vec<GpuBindGroupEntry>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -313,7 +316,7 @@ pub fn op_webgpu_create_bind_group(
|
|||||||
let bind_group_layout = state.resource_table.get::<WebGpuBindGroupLayout>(layout)?;
|
let bind_group_layout = state.resource_table.get::<WebGpuBindGroupLayout>(layout)?;
|
||||||
|
|
||||||
let descriptor = wgpu_core::binding_model::BindGroupDescriptor {
|
let descriptor = wgpu_core::binding_model::BindGroupDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
layout: bind_group_layout.1,
|
layout: bind_group_layout.1,
|
||||||
entries: Cow::from(entries),
|
entries: Cow::from(entries),
|
||||||
};
|
};
|
||||||
|
|||||||
@ -3,14 +3,12 @@
|
|||||||
use deno_core::error::type_error;
|
use deno_core::error::type_error;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::futures::channel::oneshot;
|
use deno_core::futures::channel::oneshot;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::convert::TryFrom;
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use wgpu_core::resource::BufferAccessResult;
|
use wgpu_core::resource::BufferAccessResult;
|
||||||
@ -40,12 +38,13 @@ impl Resource for WebGpuBufferMapped {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_buffer(
|
pub fn op_webgpu_create_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
size: u64,
|
#[number] size: u64,
|
||||||
usage: u32,
|
usage: u32,
|
||||||
mapped_at_creation: bool,
|
mapped_at_creation: bool,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
@ -56,7 +55,7 @@ pub fn op_webgpu_create_buffer(
|
|||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
|
|
||||||
let descriptor = wgpu_core::resource::BufferDescriptor {
|
let descriptor = wgpu_core::resource::BufferDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
size,
|
size,
|
||||||
usage: wgpu_types::BufferUsages::from_bits(usage)
|
usage: wgpu_types::BufferUsages::from_bits(usage)
|
||||||
.ok_or_else(|| type_error("usage is not valid"))?,
|
.ok_or_else(|| type_error("usage is not valid"))?,
|
||||||
@ -70,14 +69,15 @@ pub fn op_webgpu_create_buffer(
|
|||||||
) => state, WebGpuBuffer)
|
) => state, WebGpuBuffer)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(async)]
|
||||||
|
#[serde]
|
||||||
pub async fn op_webgpu_buffer_get_map_async(
|
pub async fn op_webgpu_buffer_get_map_async(
|
||||||
state: Rc<RefCell<OpState>>,
|
state: Rc<RefCell<OpState>>,
|
||||||
buffer_rid: ResourceId,
|
#[smi] buffer_rid: ResourceId,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
mode: u32,
|
mode: u32,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: u64,
|
#[number] size: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let (sender, receiver) = oneshot::channel::<BufferAccessResult>();
|
let (sender, receiver) = oneshot::channel::<BufferAccessResult>();
|
||||||
|
|
||||||
@ -143,13 +143,14 @@ pub async fn op_webgpu_buffer_get_map_async(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_buffer_get_mapped_range(
|
pub fn op_webgpu_buffer_get_mapped_range(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
buffer_rid: ResourceId,
|
#[smi] buffer_rid: ResourceId,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: Option<u64>,
|
#[number] size: Option<u64>,
|
||||||
mut buf: ZeroCopyBuf,
|
#[buffer] buf: &mut [u8],
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let buffer_resource = state.resource_table.get::<WebGpuBuffer>(buffer_rid)?;
|
let buffer_resource = state.resource_table.get::<WebGpuBuffer>(buffer_rid)?;
|
||||||
@ -172,12 +173,13 @@ pub fn op_webgpu_buffer_get_mapped_range(
|
|||||||
Ok(WebGpuResult::rid(rid))
|
Ok(WebGpuResult::rid(rid))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_buffer_unmap(
|
pub fn op_webgpu_buffer_unmap(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
buffer_rid: ResourceId,
|
#[smi] buffer_rid: ResourceId,
|
||||||
mapped_rid: ResourceId,
|
#[smi] mapped_rid: ResourceId,
|
||||||
buf: Option<ZeroCopyBuf>,
|
#[buffer] buf: Option<&[u8]>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let mapped_resource = state
|
let mapped_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -188,7 +190,7 @@ pub fn op_webgpu_buffer_unmap(
|
|||||||
|
|
||||||
if let Some(buf) = buf {
|
if let Some(buf) = buf {
|
||||||
let slice = unsafe { std::slice::from_raw_parts_mut(mapped_resource.0, mapped_resource.1) };
|
let slice = unsafe { std::slice::from_raw_parts_mut(mapped_resource.0, mapped_resource.1) };
|
||||||
slice.copy_from_slice(&buf);
|
slice.copy_from_slice(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx_ok!(buffer => instance.buffer_unmap(buffer))
|
gfx_ok!(buffer => instance.buffer_unmap(buffer))
|
||||||
|
|||||||
@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
use deno_core::error::type_error;
|
use deno_core::error::type_error;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
@ -40,7 +39,7 @@ impl Resource for WebGpuRenderBundle {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateRenderBundleEncoderArgs {
|
pub struct CreateRenderBundleEncoderArgs {
|
||||||
device_rid: ResourceId,
|
device_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
color_formats: Vec<Option<wgpu_types::TextureFormat>>,
|
color_formats: Vec<Option<wgpu_types::TextureFormat>>,
|
||||||
depth_stencil_format: Option<wgpu_types::TextureFormat>,
|
depth_stencil_format: Option<wgpu_types::TextureFormat>,
|
||||||
sample_count: u32,
|
sample_count: u32,
|
||||||
@ -48,10 +47,11 @@ pub struct CreateRenderBundleEncoderArgs {
|
|||||||
stencil_read_only: bool,
|
stencil_read_only: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_render_bundle_encoder(
|
pub fn op_webgpu_create_render_bundle_encoder(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateRenderBundleEncoderArgs,
|
#[serde] args: CreateRenderBundleEncoderArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -67,7 +67,7 @@ pub fn op_webgpu_create_render_bundle_encoder(
|
|||||||
});
|
});
|
||||||
|
|
||||||
let descriptor = wgpu_core::command::RenderBundleEncoderDescriptor {
|
let descriptor = wgpu_core::command::RenderBundleEncoderDescriptor {
|
||||||
label: args.label.map(Cow::from),
|
label: Some(Cow::Owned(args.label)),
|
||||||
color_formats: Cow::from(args.color_formats),
|
color_formats: Cow::from(args.color_formats),
|
||||||
sample_count: args.sample_count,
|
sample_count: args.sample_count,
|
||||||
depth_stencil,
|
depth_stencil,
|
||||||
@ -92,11 +92,12 @@ pub fn op_webgpu_create_render_bundle_encoder(
|
|||||||
Ok(WebGpuResult::rid_err(rid, maybe_err))
|
Ok(WebGpuResult::rid_err(rid, maybe_err))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_finish(
|
pub fn op_webgpu_render_bundle_encoder_finish(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_bundle_encoder_resource = state
|
let render_bundle_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -111,21 +112,22 @@ pub fn op_webgpu_render_bundle_encoder_finish(
|
|||||||
gfx_put!(render_bundle_encoder.parent() => instance.render_bundle_encoder_finish(
|
gfx_put!(render_bundle_encoder.parent() => instance.render_bundle_encoder_finish(
|
||||||
render_bundle_encoder,
|
render_bundle_encoder,
|
||||||
&wgpu_core::command::RenderBundleDescriptor {
|
&wgpu_core::command::RenderBundleDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
},
|
},
|
||||||
()
|
()
|
||||||
) => state, WebGpuRenderBundle)
|
) => state, WebGpuRenderBundle)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_set_bind_group(
|
pub fn op_webgpu_render_bundle_encoder_set_bind_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
index: u32,
|
index: u32,
|
||||||
bind_group: ResourceId,
|
#[smi] bind_group: ResourceId,
|
||||||
dynamic_offsets_data: ZeroCopyBuf,
|
#[buffer] dynamic_offsets_data: &[u32],
|
||||||
dynamic_offsets_data_start: usize,
|
#[number] dynamic_offsets_data_start: usize,
|
||||||
dynamic_offsets_data_length: usize,
|
#[number] dynamic_offsets_data_length: usize,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let bind_group_resource = state
|
let bind_group_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -134,14 +136,6 @@ pub fn op_webgpu_render_bundle_encoder_set_bind_group(
|
|||||||
.resource_table
|
.resource_table
|
||||||
.get::<WebGpuRenderBundleEncoder>(render_bundle_encoder_rid)?;
|
.get::<WebGpuRenderBundleEncoder>(render_bundle_encoder_rid)?;
|
||||||
|
|
||||||
// Align the data
|
|
||||||
assert!(dynamic_offsets_data.len() % std::mem::size_of::<u32>() == 0);
|
|
||||||
// SAFETY: A u8 to u32 cast is safe because we asserted that the length is a
|
|
||||||
// multiple of 4.
|
|
||||||
let (prefix, dynamic_offsets_data, suffix) = unsafe { dynamic_offsets_data.align_to::<u32>() };
|
|
||||||
assert!(prefix.is_empty());
|
|
||||||
assert!(suffix.is_empty());
|
|
||||||
|
|
||||||
let start = dynamic_offsets_data_start;
|
let start = dynamic_offsets_data_start;
|
||||||
let len = dynamic_offsets_data_length;
|
let len = dynamic_offsets_data_length;
|
||||||
|
|
||||||
@ -149,7 +143,7 @@ pub fn op_webgpu_render_bundle_encoder_set_bind_group(
|
|||||||
assert!(start <= dynamic_offsets_data.len());
|
assert!(start <= dynamic_offsets_data.len());
|
||||||
assert!(len <= dynamic_offsets_data.len() - start);
|
assert!(len <= dynamic_offsets_data.len() - start);
|
||||||
|
|
||||||
let dynamic_offsets_data: &[u32] = &dynamic_offsets_data[start..start + len];
|
let dynamic_offsets_data = &dynamic_offsets_data[start..start + len];
|
||||||
|
|
||||||
// SAFETY: the raw pointer and length are of the same slice, and that slice
|
// SAFETY: the raw pointer and length are of the same slice, and that slice
|
||||||
// lives longer than the below function invocation.
|
// lives longer than the below function invocation.
|
||||||
@ -166,11 +160,12 @@ pub fn op_webgpu_render_bundle_encoder_set_bind_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_push_debug_group(
|
pub fn op_webgpu_render_bundle_encoder_push_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
group_label: String,
|
#[string] group_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_bundle_encoder_resource = state
|
let render_bundle_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -189,10 +184,11 @@ pub fn op_webgpu_render_bundle_encoder_push_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_pop_debug_group(
|
pub fn op_webgpu_render_bundle_encoder_pop_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_bundle_encoder_resource = state
|
let render_bundle_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -205,11 +201,12 @@ pub fn op_webgpu_render_bundle_encoder_pop_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_insert_debug_marker(
|
pub fn op_webgpu_render_bundle_encoder_insert_debug_marker(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
marker_label: String,
|
#[string] marker_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_bundle_encoder_resource = state
|
let render_bundle_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -228,11 +225,12 @@ pub fn op_webgpu_render_bundle_encoder_insert_debug_marker(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_set_pipeline(
|
pub fn op_webgpu_render_bundle_encoder_set_pipeline(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
pipeline: ResourceId,
|
#[smi] pipeline: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pipeline_resource = state
|
let render_pipeline_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -249,14 +247,15 @@ pub fn op_webgpu_render_bundle_encoder_set_pipeline(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_set_index_buffer(
|
pub fn op_webgpu_render_bundle_encoder_set_index_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
buffer: ResourceId,
|
#[smi] buffer: ResourceId,
|
||||||
index_format: wgpu_types::IndexFormat,
|
#[serde] index_format: wgpu_types::IndexFormat,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: u64,
|
#[number] size: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -276,14 +275,15 @@ pub fn op_webgpu_render_bundle_encoder_set_index_buffer(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer(
|
pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
slot: u32,
|
slot: u32,
|
||||||
buffer: ResourceId,
|
#[smi] buffer: ResourceId,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: Option<u64>,
|
#[number] size: Option<u64>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -311,10 +311,11 @@ pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_draw(
|
pub fn op_webgpu_render_bundle_encoder_draw(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
vertex_count: u32,
|
vertex_count: u32,
|
||||||
instance_count: u32,
|
instance_count: u32,
|
||||||
first_vertex: u32,
|
first_vertex: u32,
|
||||||
@ -335,10 +336,11 @@ pub fn op_webgpu_render_bundle_encoder_draw(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_draw_indexed(
|
pub fn op_webgpu_render_bundle_encoder_draw_indexed(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
index_count: u32,
|
index_count: u32,
|
||||||
instance_count: u32,
|
instance_count: u32,
|
||||||
first_index: u32,
|
first_index: u32,
|
||||||
@ -361,12 +363,13 @@ pub fn op_webgpu_render_bundle_encoder_draw_indexed(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_bundle_encoder_draw_indirect(
|
pub fn op_webgpu_render_bundle_encoder_draw_indirect(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_bundle_encoder_rid: ResourceId,
|
#[smi] render_bundle_encoder_rid: ResourceId,
|
||||||
indirect_buffer: ResourceId,
|
#[smi] indirect_buffer: ResourceId,
|
||||||
indirect_offset: u64,
|
#[number] indirect_offset: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
|
use crate::WebGpuQuerySet;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -44,11 +45,12 @@ impl Resource for WebGpuCommandBuffer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_command_encoder(
|
pub fn op_webgpu_create_command_encoder(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -56,9 +58,7 @@ pub fn op_webgpu_create_command_encoder(
|
|||||||
.get::<super::WebGpuDevice>(device_rid)?;
|
.get::<super::WebGpuDevice>(device_rid)?;
|
||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
|
|
||||||
let descriptor = wgpu_types::CommandEncoderDescriptor {
|
let descriptor = wgpu_types::CommandEncoderDescriptor { label: Some(label) };
|
||||||
label: label.map(Cow::from),
|
|
||||||
};
|
|
||||||
|
|
||||||
gfx_put!(device => instance.device_create_command_encoder(
|
gfx_put!(device => instance.device_create_command_encoder(
|
||||||
device,
|
device,
|
||||||
@ -91,14 +91,24 @@ pub struct GpuRenderPassDepthStencilAttachment {
|
|||||||
stencil_read_only: bool,
|
stencil_read_only: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GPURenderPassTimestampWrites {
|
||||||
|
query_set: ResourceId,
|
||||||
|
beginning_of_pass_write_index: Option<u32>,
|
||||||
|
end_of_pass_write_index: Option<u32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_begin_render_pass(
|
pub fn op_webgpu_command_encoder_begin_render_pass(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
color_attachments: Vec<Option<GpuRenderPassColorAttachment>>,
|
#[serde] color_attachments: Vec<Option<GpuRenderPassColorAttachment>>,
|
||||||
depth_stencil_attachment: Option<GpuRenderPassDepthStencilAttachment>,
|
#[serde] depth_stencil_attachment: Option<GpuRenderPassDepthStencilAttachment>,
|
||||||
occlusion_query_set: Option<ResourceId>,
|
#[smi] occlusion_query_set: Option<ResourceId>,
|
||||||
|
#[serde] timestamp_writes: Option<GPURenderPassTimestampWrites>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -172,16 +182,31 @@ pub fn op_webgpu_command_encoder_begin_render_pass(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let timestamp_writes = if let Some(timestamp_writes) = timestamp_writes {
|
||||||
|
let query_set_resource = state
|
||||||
|
.resource_table
|
||||||
|
.get::<WebGpuQuerySet>(timestamp_writes.query_set)?;
|
||||||
|
let query_set = query_set_resource.1;
|
||||||
|
|
||||||
|
Some(wgpu_core::command::RenderPassTimestampWrites {
|
||||||
|
query_set,
|
||||||
|
beginning_of_pass_write_index: timestamp_writes.beginning_of_pass_write_index,
|
||||||
|
end_of_pass_write_index: timestamp_writes.end_of_pass_write_index,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let occlusion_query_set_resource = occlusion_query_set
|
let occlusion_query_set_resource = occlusion_query_set
|
||||||
.map(|rid| state.resource_table.get::<super::WebGpuQuerySet>(rid))
|
.map(|rid| state.resource_table.get::<WebGpuQuerySet>(rid))
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(|query_set| query_set.1);
|
.map(|query_set| query_set.1);
|
||||||
|
|
||||||
let descriptor = wgpu_core::command::RenderPassDescriptor {
|
let descriptor = wgpu_core::command::RenderPassDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
color_attachments: Cow::from(color_attachments),
|
color_attachments: Cow::from(color_attachments),
|
||||||
depth_stencil_attachment: processed_depth_stencil_attachment.as_ref(),
|
depth_stencil_attachment: processed_depth_stencil_attachment.as_ref(),
|
||||||
timestamp_writes: None,
|
timestamp_writes: timestamp_writes.as_ref(),
|
||||||
occlusion_query_set: occlusion_query_set_resource,
|
occlusion_query_set: occlusion_query_set_resource,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -196,19 +221,44 @@ pub fn op_webgpu_command_encoder_begin_render_pass(
|
|||||||
Ok(WebGpuResult::rid(rid))
|
Ok(WebGpuResult::rid(rid))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct GPUComputePassTimestampWrites {
|
||||||
|
query_set: ResourceId,
|
||||||
|
beginning_of_pass_write_index: Option<u32>,
|
||||||
|
end_of_pass_write_index: Option<u32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_begin_compute_pass(
|
pub fn op_webgpu_command_encoder_begin_compute_pass(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
|
#[serde] timestamp_writes: Option<GPUComputePassTimestampWrites>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
.get::<WebGpuCommandEncoder>(command_encoder_rid)?;
|
.get::<WebGpuCommandEncoder>(command_encoder_rid)?;
|
||||||
|
|
||||||
|
let timestamp_writes = if let Some(timestamp_writes) = timestamp_writes {
|
||||||
|
let query_set_resource = state
|
||||||
|
.resource_table
|
||||||
|
.get::<WebGpuQuerySet>(timestamp_writes.query_set)?;
|
||||||
|
let query_set = query_set_resource.1;
|
||||||
|
|
||||||
|
Some(wgpu_core::command::ComputePassTimestampWrites {
|
||||||
|
query_set,
|
||||||
|
beginning_of_pass_write_index: timestamp_writes.beginning_of_pass_write_index,
|
||||||
|
end_of_pass_write_index: timestamp_writes.end_of_pass_write_index,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let descriptor = wgpu_core::command::ComputePassDescriptor {
|
let descriptor = wgpu_core::command::ComputePassDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
timestamp_writes: None,
|
timestamp_writes: timestamp_writes.as_ref(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let compute_pass =
|
let compute_pass =
|
||||||
@ -223,15 +273,16 @@ pub fn op_webgpu_command_encoder_begin_compute_pass(
|
|||||||
Ok(WebGpuResult::rid(rid))
|
Ok(WebGpuResult::rid(rid))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_copy_buffer_to_buffer(
|
pub fn op_webgpu_command_encoder_copy_buffer_to_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
source: ResourceId,
|
#[smi] source: ResourceId,
|
||||||
source_offset: u64,
|
#[number] source_offset: u64,
|
||||||
destination: ResourceId,
|
#[smi] destination: ResourceId,
|
||||||
destination_offset: u64,
|
#[number] destination_offset: u64,
|
||||||
size: u64,
|
#[number] size: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -275,13 +326,14 @@ pub struct GpuImageCopyTexture {
|
|||||||
pub aspect: wgpu_types::TextureAspect,
|
pub aspect: wgpu_types::TextureAspect,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_copy_buffer_to_texture(
|
pub fn op_webgpu_command_encoder_copy_buffer_to_texture(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
source: GpuImageCopyBuffer,
|
#[serde] source: GpuImageCopyBuffer,
|
||||||
destination: GpuImageCopyTexture,
|
#[serde] destination: GpuImageCopyTexture,
|
||||||
copy_size: wgpu_types::Extent3d,
|
#[serde] copy_size: wgpu_types::Extent3d,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -317,13 +369,14 @@ pub fn op_webgpu_command_encoder_copy_buffer_to_texture(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_copy_texture_to_buffer(
|
pub fn op_webgpu_command_encoder_copy_texture_to_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
source: GpuImageCopyTexture,
|
#[serde] source: GpuImageCopyTexture,
|
||||||
destination: GpuImageCopyBuffer,
|
#[serde] destination: GpuImageCopyBuffer,
|
||||||
copy_size: wgpu_types::Extent3d,
|
#[serde] copy_size: wgpu_types::Extent3d,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -359,13 +412,14 @@ pub fn op_webgpu_command_encoder_copy_texture_to_buffer(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_copy_texture_to_texture(
|
pub fn op_webgpu_command_encoder_copy_texture_to_texture(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
source: GpuImageCopyTexture,
|
#[serde] source: GpuImageCopyTexture,
|
||||||
destination: GpuImageCopyTexture,
|
#[serde] destination: GpuImageCopyTexture,
|
||||||
copy_size: wgpu_types::Extent3d,
|
#[serde] copy_size: wgpu_types::Extent3d,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -399,13 +453,14 @@ pub fn op_webgpu_command_encoder_copy_texture_to_texture(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_clear_buffer(
|
pub fn op_webgpu_command_encoder_clear_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: u32,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
buffer_rid: u32,
|
#[smi] buffer_rid: ResourceId,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: u64,
|
#[number] size: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -424,11 +479,12 @@ pub fn op_webgpu_command_encoder_clear_buffer(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_push_debug_group(
|
pub fn op_webgpu_command_encoder_push_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
group_label: String,
|
#[string] group_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -436,13 +492,14 @@ pub fn op_webgpu_command_encoder_push_debug_group(
|
|||||||
.get::<WebGpuCommandEncoder>(command_encoder_rid)?;
|
.get::<WebGpuCommandEncoder>(command_encoder_rid)?;
|
||||||
let command_encoder = command_encoder_resource.1;
|
let command_encoder = command_encoder_resource.1;
|
||||||
|
|
||||||
gfx_ok!(command_encoder => instance.command_encoder_push_debug_group(command_encoder, &group_label))
|
gfx_ok!(command_encoder => instance.command_encoder_push_debug_group(command_encoder, group_label))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_pop_debug_group(
|
pub fn op_webgpu_command_encoder_pop_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -453,11 +510,12 @@ pub fn op_webgpu_command_encoder_pop_debug_group(
|
|||||||
gfx_ok!(command_encoder => instance.command_encoder_pop_debug_group(command_encoder))
|
gfx_ok!(command_encoder => instance.command_encoder_pop_debug_group(command_encoder))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_insert_debug_marker(
|
pub fn op_webgpu_command_encoder_insert_debug_marker(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
marker_label: String,
|
#[string] marker_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -467,15 +525,16 @@ pub fn op_webgpu_command_encoder_insert_debug_marker(
|
|||||||
|
|
||||||
gfx_ok!(command_encoder => instance.command_encoder_insert_debug_marker(
|
gfx_ok!(command_encoder => instance.command_encoder_insert_debug_marker(
|
||||||
command_encoder,
|
command_encoder,
|
||||||
&marker_label
|
marker_label
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_write_timestamp(
|
pub fn op_webgpu_command_encoder_write_timestamp(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
query_set: ResourceId,
|
#[smi] query_set: ResourceId,
|
||||||
query_index: u32,
|
query_index: u32,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
@ -494,15 +553,16 @@ pub fn op_webgpu_command_encoder_write_timestamp(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_resolve_query_set(
|
pub fn op_webgpu_command_encoder_resolve_query_set(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
query_set: ResourceId,
|
#[smi] query_set: ResourceId,
|
||||||
first_query: u32,
|
first_query: u32,
|
||||||
query_count: u32,
|
query_count: u32,
|
||||||
destination: ResourceId,
|
#[smi] destination: ResourceId,
|
||||||
destination_offset: u64,
|
#[number] destination_offset: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
@ -526,11 +586,12 @@ pub fn op_webgpu_command_encoder_resolve_query_set(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_command_encoder_finish(
|
pub fn op_webgpu_command_encoder_finish(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let command_encoder_resource = state
|
let command_encoder_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -538,9 +599,7 @@ pub fn op_webgpu_command_encoder_finish(
|
|||||||
let command_encoder = command_encoder_resource.1;
|
let command_encoder = command_encoder_resource.1;
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
|
|
||||||
let descriptor = wgpu_types::CommandBufferDescriptor {
|
let descriptor = wgpu_types::CommandBufferDescriptor { label: Some(label) };
|
||||||
label: label.map(Cow::from),
|
|
||||||
};
|
|
||||||
|
|
||||||
let (val, maybe_err) = gfx_select!(command_encoder => instance.command_encoder_finish(
|
let (val, maybe_err) = gfx_select!(command_encoder => instance.command_encoder_finish(
|
||||||
command_encoder,
|
command_encoder,
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
@ -18,11 +17,12 @@ impl Resource for WebGpuComputePass {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_set_pipeline(
|
pub fn op_webgpu_compute_pass_set_pipeline(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
pipeline: ResourceId,
|
#[smi] pipeline: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let compute_pipeline_resource = state
|
let compute_pipeline_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -39,10 +39,11 @@ pub fn op_webgpu_compute_pass_set_pipeline(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_dispatch_workgroups(
|
pub fn op_webgpu_compute_pass_dispatch_workgroups(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
x: u32,
|
x: u32,
|
||||||
y: u32,
|
y: u32,
|
||||||
z: u32,
|
z: u32,
|
||||||
@ -61,12 +62,13 @@ pub fn op_webgpu_compute_pass_dispatch_workgroups(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_dispatch_workgroups_indirect(
|
pub fn op_webgpu_compute_pass_dispatch_workgroups_indirect(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
indirect_buffer: ResourceId,
|
#[smi] indirect_buffer: ResourceId,
|
||||||
indirect_offset: u64,
|
#[number] indirect_offset: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -84,73 +86,12 @@ pub fn op_webgpu_compute_pass_dispatch_workgroups_indirect(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
pub fn op_webgpu_compute_pass_begin_pipeline_statistics_query(
|
#[serde]
|
||||||
state: &mut OpState,
|
|
||||||
compute_pass_rid: ResourceId,
|
|
||||||
query_set: ResourceId,
|
|
||||||
query_index: u32,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let compute_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuComputePass>(compute_pass_rid)?;
|
|
||||||
let query_set_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<super::WebGpuQuerySet>(query_set)?;
|
|
||||||
|
|
||||||
wgpu_core::command::compute_ffi::wgpu_compute_pass_begin_pipeline_statistics_query(
|
|
||||||
&mut compute_pass_resource.0.borrow_mut(),
|
|
||||||
query_set_resource.1,
|
|
||||||
query_index,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_compute_pass_end_pipeline_statistics_query(
|
|
||||||
state: &mut OpState,
|
|
||||||
compute_pass_rid: ResourceId,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let compute_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuComputePass>(compute_pass_rid)?;
|
|
||||||
|
|
||||||
wgpu_core::command::compute_ffi::wgpu_compute_pass_end_pipeline_statistics_query(
|
|
||||||
&mut compute_pass_resource.0.borrow_mut(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_compute_pass_write_timestamp(
|
|
||||||
state: &mut OpState,
|
|
||||||
compute_pass_rid: ResourceId,
|
|
||||||
query_set: ResourceId,
|
|
||||||
query_index: u32,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let compute_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuComputePass>(compute_pass_rid)?;
|
|
||||||
let query_set_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<super::WebGpuQuerySet>(query_set)?;
|
|
||||||
|
|
||||||
wgpu_core::command::compute_ffi::wgpu_compute_pass_write_timestamp(
|
|
||||||
&mut compute_pass_resource.0.borrow_mut(),
|
|
||||||
query_set_resource.1,
|
|
||||||
query_index,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_compute_pass_end(
|
pub fn op_webgpu_compute_pass_end(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let command_encoder_resource =
|
let command_encoder_resource =
|
||||||
state
|
state
|
||||||
@ -169,15 +110,16 @@ pub fn op_webgpu_compute_pass_end(
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_set_bind_group(
|
pub fn op_webgpu_compute_pass_set_bind_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
index: u32,
|
index: u32,
|
||||||
bind_group: ResourceId,
|
#[smi] bind_group: ResourceId,
|
||||||
dynamic_offsets_data: ZeroCopyBuf,
|
#[buffer] dynamic_offsets_data: &[u32],
|
||||||
dynamic_offsets_data_start: usize,
|
#[number] dynamic_offsets_data_start: usize,
|
||||||
dynamic_offsets_data_length: usize,
|
#[number] dynamic_offsets_data_length: usize,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let bind_group_resource = state
|
let bind_group_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -186,14 +128,6 @@ pub fn op_webgpu_compute_pass_set_bind_group(
|
|||||||
.resource_table
|
.resource_table
|
||||||
.get::<WebGpuComputePass>(compute_pass_rid)?;
|
.get::<WebGpuComputePass>(compute_pass_rid)?;
|
||||||
|
|
||||||
// Align the data
|
|
||||||
assert!(dynamic_offsets_data_start % std::mem::size_of::<u32>() == 0);
|
|
||||||
// SAFETY: A u8 to u32 cast is safe because we asserted that the length is a
|
|
||||||
// multiple of 4.
|
|
||||||
let (prefix, dynamic_offsets_data, suffix) = unsafe { dynamic_offsets_data.align_to::<u32>() };
|
|
||||||
assert!(prefix.is_empty());
|
|
||||||
assert!(suffix.is_empty());
|
|
||||||
|
|
||||||
let start = dynamic_offsets_data_start;
|
let start = dynamic_offsets_data_start;
|
||||||
let len = dynamic_offsets_data_length;
|
let len = dynamic_offsets_data_length;
|
||||||
|
|
||||||
@ -218,11 +152,12 @@ pub fn op_webgpu_compute_pass_set_bind_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_push_debug_group(
|
pub fn op_webgpu_compute_pass_push_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
group_label: String,
|
#[string] group_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let compute_pass_resource = state
|
let compute_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -242,10 +177,11 @@ pub fn op_webgpu_compute_pass_push_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_pop_debug_group(
|
pub fn op_webgpu_compute_pass_pop_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let compute_pass_resource = state
|
let compute_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -258,11 +194,12 @@ pub fn op_webgpu_compute_pass_pop_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pass_insert_debug_marker(
|
pub fn op_webgpu_compute_pass_insert_debug_marker(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pass_rid: ResourceId,
|
#[smi] compute_pass_rid: ResourceId,
|
||||||
marker_label: String,
|
#[string] marker_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let compute_pass_resource = state
|
let compute_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#![warn(unsafe_op_in_unsafe_fn)]
|
#![warn(unsafe_op_in_unsafe_fn)]
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -12,7 +12,6 @@ use serde::Serialize;
|
|||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::convert::TryFrom;
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
pub use wgpu_core;
|
pub use wgpu_core;
|
||||||
pub use wgpu_types;
|
pub use wgpu_types;
|
||||||
@ -181,9 +180,8 @@ deno_core::extension!(
|
|||||||
render_pass::op_webgpu_render_pass_set_scissor_rect,
|
render_pass::op_webgpu_render_pass_set_scissor_rect,
|
||||||
render_pass::op_webgpu_render_pass_set_blend_constant,
|
render_pass::op_webgpu_render_pass_set_blend_constant,
|
||||||
render_pass::op_webgpu_render_pass_set_stencil_reference,
|
render_pass::op_webgpu_render_pass_set_stencil_reference,
|
||||||
render_pass::op_webgpu_render_pass_begin_pipeline_statistics_query,
|
render_pass::op_webgpu_render_pass_begin_occlusion_query,
|
||||||
render_pass::op_webgpu_render_pass_end_pipeline_statistics_query,
|
render_pass::op_webgpu_render_pass_end_occlusion_query,
|
||||||
render_pass::op_webgpu_render_pass_write_timestamp,
|
|
||||||
render_pass::op_webgpu_render_pass_execute_bundles,
|
render_pass::op_webgpu_render_pass_execute_bundles,
|
||||||
render_pass::op_webgpu_render_pass_end,
|
render_pass::op_webgpu_render_pass_end,
|
||||||
render_pass::op_webgpu_render_pass_set_bind_group,
|
render_pass::op_webgpu_render_pass_set_bind_group,
|
||||||
@ -200,9 +198,6 @@ deno_core::extension!(
|
|||||||
compute_pass::op_webgpu_compute_pass_set_pipeline,
|
compute_pass::op_webgpu_compute_pass_set_pipeline,
|
||||||
compute_pass::op_webgpu_compute_pass_dispatch_workgroups,
|
compute_pass::op_webgpu_compute_pass_dispatch_workgroups,
|
||||||
compute_pass::op_webgpu_compute_pass_dispatch_workgroups_indirect,
|
compute_pass::op_webgpu_compute_pass_dispatch_workgroups_indirect,
|
||||||
compute_pass::op_webgpu_compute_pass_begin_pipeline_statistics_query,
|
|
||||||
compute_pass::op_webgpu_compute_pass_end_pipeline_statistics_query,
|
|
||||||
compute_pass::op_webgpu_compute_pass_write_timestamp,
|
|
||||||
compute_pass::op_webgpu_compute_pass_end,
|
compute_pass::op_webgpu_compute_pass_end,
|
||||||
compute_pass::op_webgpu_compute_pass_set_bind_group,
|
compute_pass::op_webgpu_compute_pass_set_bind_group,
|
||||||
compute_pass::op_webgpu_compute_pass_push_debug_group,
|
compute_pass::op_webgpu_compute_pass_push_debug_group,
|
||||||
@ -388,10 +383,11 @@ pub struct GpuAdapterDevice {
|
|||||||
is_software: bool,
|
is_software: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(async)]
|
||||||
|
#[serde]
|
||||||
pub async fn op_webgpu_request_adapter(
|
pub async fn op_webgpu_request_adapter(
|
||||||
state: Rc<RefCell<OpState>>,
|
state: Rc<RefCell<OpState>>,
|
||||||
power_preference: Option<wgpu_types::PowerPreference>,
|
#[serde] power_preference: Option<wgpu_types::PowerPreference>,
|
||||||
force_fallback_adapter: bool,
|
force_fallback_adapter: bool,
|
||||||
) -> Result<GpuAdapterDeviceOrErr, AnyError> {
|
) -> Result<GpuAdapterDeviceOrErr, AnyError> {
|
||||||
let mut state = state.borrow_mut();
|
let mut state = state.borrow_mut();
|
||||||
@ -637,13 +633,14 @@ impl From<GpuRequiredFeatures> for wgpu_types::Features {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(async)]
|
||||||
|
#[serde]
|
||||||
pub async fn op_webgpu_request_device(
|
pub async fn op_webgpu_request_device(
|
||||||
state: Rc<RefCell<OpState>>,
|
state: Rc<RefCell<OpState>>,
|
||||||
adapter_rid: ResourceId,
|
#[smi] adapter_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: String,
|
||||||
required_features: GpuRequiredFeatures,
|
#[serde] required_features: GpuRequiredFeatures,
|
||||||
required_limits: Option<wgpu_types::Limits>,
|
#[serde] required_limits: Option<wgpu_types::Limits>,
|
||||||
) -> Result<GpuAdapterDevice, AnyError> {
|
) -> Result<GpuAdapterDevice, AnyError> {
|
||||||
let mut state = state.borrow_mut();
|
let mut state = state.borrow_mut();
|
||||||
let adapter_resource = state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
|
let adapter_resource = state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
|
||||||
@ -651,7 +648,7 @@ pub async fn op_webgpu_request_device(
|
|||||||
let instance = state.borrow::<Instance>();
|
let instance = state.borrow::<Instance>();
|
||||||
|
|
||||||
let descriptor = wgpu_types::DeviceDescriptor {
|
let descriptor = wgpu_types::DeviceDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(Cow::Owned(label)),
|
||||||
features: required_features.into(),
|
features: required_features.into(),
|
||||||
limits: required_limits.unwrap_or_default(),
|
limits: required_limits.unwrap_or_default(),
|
||||||
};
|
};
|
||||||
@ -691,10 +688,11 @@ pub struct GPUAdapterInfo {
|
|||||||
description: String,
|
description: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(async)]
|
||||||
|
#[serde]
|
||||||
pub async fn op_webgpu_request_adapter_info(
|
pub async fn op_webgpu_request_adapter_info(
|
||||||
state: Rc<RefCell<OpState>>,
|
state: Rc<RefCell<OpState>>,
|
||||||
adapter_rid: ResourceId,
|
#[smi] adapter_rid: ResourceId,
|
||||||
) -> Result<GPUAdapterInfo, AnyError> {
|
) -> Result<GPUAdapterInfo, AnyError> {
|
||||||
let state = state.borrow_mut();
|
let state = state.borrow_mut();
|
||||||
let adapter_resource = state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
|
let adapter_resource = state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
|
||||||
@ -715,7 +713,7 @@ pub async fn op_webgpu_request_adapter_info(
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateQuerySetArgs {
|
pub struct CreateQuerySetArgs {
|
||||||
device_rid: ResourceId,
|
device_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
r#type: GpuQueryType,
|
r#type: GpuQueryType,
|
||||||
count: u32,
|
count: u32,
|
||||||
@ -725,10 +723,6 @@ pub struct CreateQuerySetArgs {
|
|||||||
#[serde(rename_all = "kebab-case", tag = "type")]
|
#[serde(rename_all = "kebab-case", tag = "type")]
|
||||||
enum GpuQueryType {
|
enum GpuQueryType {
|
||||||
Occlusion,
|
Occlusion,
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
PipelineStatistics {
|
|
||||||
pipeline_statistics: HashSet<String>,
|
|
||||||
},
|
|
||||||
Timestamp,
|
Timestamp,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -736,47 +730,23 @@ impl From<GpuQueryType> for wgpu_types::QueryType {
|
|||||||
fn from(query_type: GpuQueryType) -> Self {
|
fn from(query_type: GpuQueryType) -> Self {
|
||||||
match query_type {
|
match query_type {
|
||||||
GpuQueryType::Occlusion => wgpu_types::QueryType::Occlusion,
|
GpuQueryType::Occlusion => wgpu_types::QueryType::Occlusion,
|
||||||
GpuQueryType::PipelineStatistics {
|
|
||||||
pipeline_statistics,
|
|
||||||
} => {
|
|
||||||
use wgpu_types::PipelineStatisticsTypes;
|
|
||||||
|
|
||||||
let mut types = PipelineStatisticsTypes::empty();
|
|
||||||
|
|
||||||
if pipeline_statistics.contains("vertex-shader-invocations") {
|
|
||||||
types.set(PipelineStatisticsTypes::VERTEX_SHADER_INVOCATIONS, true);
|
|
||||||
}
|
|
||||||
if pipeline_statistics.contains("clipper-invocations") {
|
|
||||||
types.set(PipelineStatisticsTypes::CLIPPER_INVOCATIONS, true);
|
|
||||||
}
|
|
||||||
if pipeline_statistics.contains("clipper-primitives-out") {
|
|
||||||
types.set(PipelineStatisticsTypes::CLIPPER_PRIMITIVES_OUT, true);
|
|
||||||
}
|
|
||||||
if pipeline_statistics.contains("fragment-shader-invocations") {
|
|
||||||
types.set(PipelineStatisticsTypes::FRAGMENT_SHADER_INVOCATIONS, true);
|
|
||||||
}
|
|
||||||
if pipeline_statistics.contains("compute-shader-invocations") {
|
|
||||||
types.set(PipelineStatisticsTypes::COMPUTE_SHADER_INVOCATIONS, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
wgpu_types::QueryType::PipelineStatistics(types)
|
|
||||||
}
|
|
||||||
GpuQueryType::Timestamp => wgpu_types::QueryType::Timestamp,
|
GpuQueryType::Timestamp => wgpu_types::QueryType::Timestamp,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_query_set(
|
pub fn op_webgpu_create_query_set(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateQuerySetArgs,
|
#[serde] args: CreateQuerySetArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let device_resource = state.resource_table.get::<WebGpuDevice>(args.device_rid)?;
|
let device_resource = state.resource_table.get::<WebGpuDevice>(args.device_rid)?;
|
||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
let instance = state.borrow::<Instance>();
|
let instance = state.borrow::<Instance>();
|
||||||
|
|
||||||
let descriptor = wgpu_types::QuerySetDescriptor {
|
let descriptor = wgpu_types::QuerySetDescriptor {
|
||||||
label: args.label.map(Cow::from),
|
label: Some(Cow::Owned(args.label)),
|
||||||
ty: args.r#type.into(),
|
ty: args.r#type.into(),
|
||||||
count: args.count,
|
count: args.count,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -81,13 +81,14 @@ pub struct GpuProgrammableStage {
|
|||||||
// constants: HashMap<String, GPUPipelineConstantValue>
|
// constants: HashMap<String, GPUPipelineConstantValue>
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_compute_pipeline(
|
pub fn op_webgpu_create_compute_pipeline(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
layout: GPUPipelineLayoutOrGPUAutoLayoutMode,
|
#[serde] layout: GPUPipelineLayoutOrGPUAutoLayoutMode,
|
||||||
compute: GpuProgrammableStage,
|
#[serde] compute: GpuProgrammableStage,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -108,7 +109,7 @@ pub fn op_webgpu_create_compute_pipeline(
|
|||||||
.get::<super::shader::WebGpuShaderModule>(compute.module)?;
|
.get::<super::shader::WebGpuShaderModule>(compute.module)?;
|
||||||
|
|
||||||
let descriptor = wgpu_core::pipeline::ComputePipelineDescriptor {
|
let descriptor = wgpu_core::pipeline::ComputePipelineDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
layout: pipeline_layout,
|
layout: pipeline_layout,
|
||||||
stage: wgpu_core::pipeline::ProgrammableStageDescriptor {
|
stage: wgpu_core::pipeline::ProgrammableStageDescriptor {
|
||||||
module: compute_shader_module_resource.1,
|
module: compute_shader_module_resource.1,
|
||||||
@ -148,10 +149,11 @@ pub struct PipelineLayout {
|
|||||||
err: Option<WebGpuError>,
|
err: Option<WebGpuError>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_compute_pipeline_get_bind_group_layout(
|
pub fn op_webgpu_compute_pipeline_get_bind_group_layout(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
compute_pipeline_rid: ResourceId,
|
#[smi] compute_pipeline_rid: ResourceId,
|
||||||
index: u32,
|
index: u32,
|
||||||
) -> Result<PipelineLayout, AnyError> {
|
) -> Result<PipelineLayout, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
@ -314,7 +316,7 @@ struct GpuFragmentState {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateRenderPipelineArgs {
|
pub struct CreateRenderPipelineArgs {
|
||||||
device_rid: ResourceId,
|
device_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
layout: GPUPipelineLayoutOrGPUAutoLayoutMode,
|
layout: GPUPipelineLayoutOrGPUAutoLayoutMode,
|
||||||
vertex: GpuVertexState,
|
vertex: GpuVertexState,
|
||||||
primitive: GpuPrimitiveState,
|
primitive: GpuPrimitiveState,
|
||||||
@ -323,10 +325,11 @@ pub struct CreateRenderPipelineArgs {
|
|||||||
fragment: Option<GpuFragmentState>,
|
fragment: Option<GpuFragmentState>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_render_pipeline(
|
pub fn op_webgpu_create_render_pipeline(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateRenderPipelineArgs,
|
#[serde] args: CreateRenderPipelineArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -372,7 +375,7 @@ pub fn op_webgpu_create_render_pipeline(
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let descriptor = wgpu_core::pipeline::RenderPipelineDescriptor {
|
let descriptor = wgpu_core::pipeline::RenderPipelineDescriptor {
|
||||||
label: args.label.map(Cow::Owned),
|
label: Some(Cow::Owned(args.label)),
|
||||||
layout,
|
layout,
|
||||||
vertex: wgpu_core::pipeline::VertexState {
|
vertex: wgpu_core::pipeline::VertexState {
|
||||||
stage: wgpu_core::pipeline::ProgrammableStageDescriptor {
|
stage: wgpu_core::pipeline::ProgrammableStageDescriptor {
|
||||||
@ -412,10 +415,11 @@ pub fn op_webgpu_create_render_pipeline(
|
|||||||
Ok(WebGpuResult::rid_err(rid, maybe_err))
|
Ok(WebGpuResult::rid_err(rid, maybe_err))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pipeline_get_bind_group_layout(
|
pub fn op_webgpu_render_pipeline_get_bind_group_layout(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pipeline_rid: ResourceId,
|
#[smi] render_pipeline_rid: ResourceId,
|
||||||
index: u32,
|
index: u32,
|
||||||
) -> Result<PipelineLayout, AnyError> {
|
) -> Result<PipelineLayout, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
|
|||||||
@ -1,21 +1,23 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
|
use crate::command_encoder::WebGpuCommandBuffer;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::error::WebGpuResult;
|
use super::error::WebGpuResult;
|
||||||
|
|
||||||
type WebGpuQueue = super::WebGpuDevice;
|
type WebGpuQueue = super::WebGpuDevice;
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_queue_submit(
|
pub fn op_webgpu_queue_submit(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
queue_rid: ResourceId,
|
#[smi] queue_rid: ResourceId,
|
||||||
command_buffers: Vec<ResourceId>,
|
#[serde] command_buffers: Vec<ResourceId>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let queue_resource = state.resource_table.get::<WebGpuQueue>(queue_rid)?;
|
let queue_resource = state.resource_table.get::<WebGpuQueue>(queue_rid)?;
|
||||||
@ -24,9 +26,7 @@ pub fn op_webgpu_queue_submit(
|
|||||||
let ids = command_buffers
|
let ids = command_buffers
|
||||||
.iter()
|
.iter()
|
||||||
.map(|rid| {
|
.map(|rid| {
|
||||||
let buffer_resource = state
|
let buffer_resource = state.resource_table.get::<WebGpuCommandBuffer>(*rid)?;
|
||||||
.resource_table
|
|
||||||
.get::<super::command_encoder::WebGpuCommandBuffer>(*rid)?;
|
|
||||||
let mut id = buffer_resource.1.borrow_mut();
|
let mut id = buffer_resource.1.borrow_mut();
|
||||||
Ok(id.take().unwrap())
|
Ok(id.take().unwrap())
|
||||||
})
|
})
|
||||||
@ -35,7 +35,8 @@ pub fn op_webgpu_queue_submit(
|
|||||||
let maybe_err = gfx_select!(queue => instance.queue_submit(queue, &ids)).err();
|
let maybe_err = gfx_select!(queue => instance.queue_submit(queue, &ids)).err();
|
||||||
|
|
||||||
for rid in command_buffers {
|
for rid in command_buffers {
|
||||||
state.resource_table.close(rid)?;
|
let resource = state.resource_table.take::<WebGpuCommandBuffer>(rid)?;
|
||||||
|
resource.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(WebGpuResult::maybe_err(maybe_err))
|
Ok(WebGpuResult::maybe_err(maybe_err))
|
||||||
@ -59,15 +60,16 @@ impl From<GpuImageDataLayout> for wgpu_types::ImageDataLayout {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_write_buffer(
|
pub fn op_webgpu_write_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
queue_rid: ResourceId,
|
#[smi] queue_rid: ResourceId,
|
||||||
buffer: ResourceId,
|
#[smi] buffer: ResourceId,
|
||||||
buffer_offset: u64,
|
#[number] buffer_offset: u64,
|
||||||
data_offset: usize,
|
#[number] data_offset: usize,
|
||||||
size: Option<usize>,
|
#[number] size: Option<usize>,
|
||||||
buf: ZeroCopyBuf,
|
#[buffer] buf: &[u8],
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
@ -92,14 +94,15 @@ pub fn op_webgpu_write_buffer(
|
|||||||
Ok(WebGpuResult::maybe_err(maybe_err))
|
Ok(WebGpuResult::maybe_err(maybe_err))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_write_texture(
|
pub fn op_webgpu_write_texture(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
queue_rid: ResourceId,
|
#[smi] queue_rid: ResourceId,
|
||||||
destination: super::command_encoder::GpuImageCopyTexture,
|
#[serde] destination: super::command_encoder::GpuImageCopyTexture,
|
||||||
data_layout: GpuImageDataLayout,
|
#[serde] data_layout: GpuImageDataLayout,
|
||||||
size: wgpu_types::Extent3d,
|
#[serde] size: wgpu_types::Extent3d,
|
||||||
buf: ZeroCopyBuf,
|
#[buffer] buf: &[u8],
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let texture_resource = state
|
let texture_resource = state
|
||||||
@ -119,7 +122,7 @@ pub fn op_webgpu_write_texture(
|
|||||||
gfx_ok!(queue => instance.queue_write_texture(
|
gfx_ok!(queue => instance.queue_write_texture(
|
||||||
queue,
|
queue,
|
||||||
&destination,
|
&destination,
|
||||||
&*buf,
|
buf,
|
||||||
&data_layout,
|
&data_layout,
|
||||||
&size
|
&size
|
||||||
))
|
))
|
||||||
|
|||||||
@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
use deno_core::error::type_error;
|
use deno_core::error::type_error;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
use deno_core::ZeroCopyBuf;
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
@ -32,10 +31,11 @@ pub struct RenderPassSetViewportArgs {
|
|||||||
max_depth: f32,
|
max_depth: f32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_viewport(
|
pub fn op_webgpu_render_pass_set_viewport(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: RenderPassSetViewportArgs,
|
#[serde] args: RenderPassSetViewportArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -54,10 +54,11 @@ pub fn op_webgpu_render_pass_set_viewport(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_scissor_rect(
|
pub fn op_webgpu_render_pass_set_scissor_rect(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
x: u32,
|
x: u32,
|
||||||
y: u32,
|
y: u32,
|
||||||
width: u32,
|
width: u32,
|
||||||
@ -78,11 +79,12 @@ pub fn op_webgpu_render_pass_set_scissor_rect(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_blend_constant(
|
pub fn op_webgpu_render_pass_set_blend_constant(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
color: wgpu_types::Color,
|
#[serde] color: wgpu_types::Color,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -96,10 +98,11 @@ pub fn op_webgpu_render_pass_set_blend_constant(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_stencil_reference(
|
pub fn op_webgpu_render_pass_set_stencil_reference(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
reference: u32,
|
reference: u32,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
@ -114,10 +117,11 @@ pub fn op_webgpu_render_pass_set_stencil_reference(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_begin_occlusion_query(
|
pub fn op_webgpu_render_pass_begin_occlusion_query(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
query_index: u32,
|
query_index: u32,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
@ -132,10 +136,11 @@ pub fn op_webgpu_render_pass_begin_occlusion_query(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_end_occlusion_query(
|
pub fn op_webgpu_render_pass_end_occlusion_query(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -148,73 +153,12 @@ pub fn op_webgpu_render_pass_end_occlusion_query(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
pub fn op_webgpu_render_pass_begin_pipeline_statistics_query(
|
#[serde]
|
||||||
state: &mut OpState,
|
|
||||||
render_pass_rid: ResourceId,
|
|
||||||
query_set: u32,
|
|
||||||
query_index: u32,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let render_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuRenderPass>(render_pass_rid)?;
|
|
||||||
let query_set_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<super::WebGpuQuerySet>(query_set)?;
|
|
||||||
|
|
||||||
wgpu_core::command::render_ffi::wgpu_render_pass_begin_pipeline_statistics_query(
|
|
||||||
&mut render_pass_resource.0.borrow_mut(),
|
|
||||||
query_set_resource.1,
|
|
||||||
query_index,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_render_pass_end_pipeline_statistics_query(
|
|
||||||
state: &mut OpState,
|
|
||||||
render_pass_rid: ResourceId,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let render_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuRenderPass>(render_pass_rid)?;
|
|
||||||
|
|
||||||
wgpu_core::command::render_ffi::wgpu_render_pass_end_pipeline_statistics_query(
|
|
||||||
&mut render_pass_resource.0.borrow_mut(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_render_pass_write_timestamp(
|
|
||||||
state: &mut OpState,
|
|
||||||
render_pass_rid: ResourceId,
|
|
||||||
query_set: u32,
|
|
||||||
query_index: u32,
|
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
|
||||||
let render_pass_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<WebGpuRenderPass>(render_pass_rid)?;
|
|
||||||
let query_set_resource = state
|
|
||||||
.resource_table
|
|
||||||
.get::<super::WebGpuQuerySet>(query_set)?;
|
|
||||||
|
|
||||||
wgpu_core::command::render_ffi::wgpu_render_pass_write_timestamp(
|
|
||||||
&mut render_pass_resource.0.borrow_mut(),
|
|
||||||
query_set_resource.1,
|
|
||||||
query_index,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(WebGpuResult::empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[op]
|
|
||||||
pub fn op_webgpu_render_pass_execute_bundles(
|
pub fn op_webgpu_render_pass_execute_bundles(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
bundles: Vec<u32>,
|
#[serde] bundles: Vec<u32>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let bundles = bundles
|
let bundles = bundles
|
||||||
.iter()
|
.iter()
|
||||||
@ -243,11 +187,12 @@ pub fn op_webgpu_render_pass_execute_bundles(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_end(
|
pub fn op_webgpu_render_pass_end(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
command_encoder_rid: ResourceId,
|
#[smi] command_encoder_rid: ResourceId,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let command_encoder_resource =
|
let command_encoder_resource =
|
||||||
state
|
state
|
||||||
@ -263,15 +208,16 @@ pub fn op_webgpu_render_pass_end(
|
|||||||
gfx_ok!(command_encoder => instance.command_encoder_run_render_pass(command_encoder, render_pass))
|
gfx_ok!(command_encoder => instance.command_encoder_run_render_pass(command_encoder, render_pass))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_bind_group(
|
pub fn op_webgpu_render_pass_set_bind_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
index: u32,
|
index: u32,
|
||||||
bind_group: u32,
|
bind_group: u32,
|
||||||
dynamic_offsets_data: ZeroCopyBuf,
|
#[buffer] dynamic_offsets_data: &[u32],
|
||||||
dynamic_offsets_data_start: usize,
|
#[number] dynamic_offsets_data_start: usize,
|
||||||
dynamic_offsets_data_length: usize,
|
#[number] dynamic_offsets_data_length: usize,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let bind_group_resource = state
|
let bind_group_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -280,14 +226,6 @@ pub fn op_webgpu_render_pass_set_bind_group(
|
|||||||
.resource_table
|
.resource_table
|
||||||
.get::<WebGpuRenderPass>(render_pass_rid)?;
|
.get::<WebGpuRenderPass>(render_pass_rid)?;
|
||||||
|
|
||||||
// Align the data
|
|
||||||
assert_eq!(dynamic_offsets_data_start % std::mem::size_of::<u32>(), 0);
|
|
||||||
// SAFETY: A u8 to u32 cast is safe because we asserted that the length is a
|
|
||||||
// multiple of 4.
|
|
||||||
let (prefix, dynamic_offsets_data, suffix) = unsafe { dynamic_offsets_data.align_to::<u32>() };
|
|
||||||
assert!(prefix.is_empty());
|
|
||||||
assert!(suffix.is_empty());
|
|
||||||
|
|
||||||
let start = dynamic_offsets_data_start;
|
let start = dynamic_offsets_data_start;
|
||||||
let len = dynamic_offsets_data_length;
|
let len = dynamic_offsets_data_length;
|
||||||
|
|
||||||
@ -312,11 +250,12 @@ pub fn op_webgpu_render_pass_set_bind_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_push_debug_group(
|
pub fn op_webgpu_render_pass_push_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
group_label: String,
|
#[string] group_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -336,10 +275,11 @@ pub fn op_webgpu_render_pass_push_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_pop_debug_group(
|
pub fn op_webgpu_render_pass_pop_debug_group(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -352,11 +292,12 @@ pub fn op_webgpu_render_pass_pop_debug_group(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_insert_debug_marker(
|
pub fn op_webgpu_render_pass_insert_debug_marker(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
marker_label: String,
|
#[string] marker_label: &str,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pass_resource = state
|
let render_pass_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -376,10 +317,11 @@ pub fn op_webgpu_render_pass_insert_debug_marker(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_pipeline(
|
pub fn op_webgpu_render_pass_set_pipeline(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
pipeline: u32,
|
pipeline: u32,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let render_pipeline_resource = state
|
let render_pipeline_resource = state
|
||||||
@ -397,14 +339,15 @@ pub fn op_webgpu_render_pass_set_pipeline(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_index_buffer(
|
pub fn op_webgpu_render_pass_set_index_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
buffer: u32,
|
buffer: u32,
|
||||||
index_format: wgpu_types::IndexFormat,
|
#[serde] index_format: wgpu_types::IndexFormat,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: Option<u64>,
|
#[number] size: Option<u64>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -432,14 +375,15 @@ pub fn op_webgpu_render_pass_set_index_buffer(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_set_vertex_buffer(
|
pub fn op_webgpu_render_pass_set_vertex_buffer(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
slot: u32,
|
slot: u32,
|
||||||
buffer: u32,
|
buffer: u32,
|
||||||
offset: u64,
|
#[number] offset: u64,
|
||||||
size: Option<u64>,
|
#[number] size: Option<u64>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -468,10 +412,11 @@ pub fn op_webgpu_render_pass_set_vertex_buffer(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_draw(
|
pub fn op_webgpu_render_pass_draw(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
vertex_count: u32,
|
vertex_count: u32,
|
||||||
instance_count: u32,
|
instance_count: u32,
|
||||||
first_vertex: u32,
|
first_vertex: u32,
|
||||||
@ -492,10 +437,11 @@ pub fn op_webgpu_render_pass_draw(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_draw_indexed(
|
pub fn op_webgpu_render_pass_draw_indexed(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
index_count: u32,
|
index_count: u32,
|
||||||
instance_count: u32,
|
instance_count: u32,
|
||||||
first_index: u32,
|
first_index: u32,
|
||||||
@ -518,12 +464,13 @@ pub fn op_webgpu_render_pass_draw_indexed(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_draw_indirect(
|
pub fn op_webgpu_render_pass_draw_indirect(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
indirect_buffer: u32,
|
indirect_buffer: u32,
|
||||||
indirect_offset: u64,
|
#[number] indirect_offset: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
@ -541,12 +488,13 @@ pub fn op_webgpu_render_pass_draw_indirect(
|
|||||||
Ok(WebGpuResult::empty())
|
Ok(WebGpuResult::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_render_pass_draw_indexed_indirect(
|
pub fn op_webgpu_render_pass_draw_indexed_indirect(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
render_pass_rid: ResourceId,
|
#[smi] render_pass_rid: ResourceId,
|
||||||
indirect_buffer: u32,
|
indirect_buffer: u32,
|
||||||
indirect_offset: u64,
|
#[number] indirect_offset: u64,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let buffer_resource = state
|
let buffer_resource = state
|
||||||
.resource_table
|
.resource_table
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -30,7 +30,7 @@ impl Resource for WebGpuSampler {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateSamplerArgs {
|
pub struct CreateSamplerArgs {
|
||||||
device_rid: ResourceId,
|
device_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
address_mode_u: wgpu_types::AddressMode,
|
address_mode_u: wgpu_types::AddressMode,
|
||||||
address_mode_v: wgpu_types::AddressMode,
|
address_mode_v: wgpu_types::AddressMode,
|
||||||
address_mode_w: wgpu_types::AddressMode,
|
address_mode_w: wgpu_types::AddressMode,
|
||||||
@ -43,10 +43,11 @@ pub struct CreateSamplerArgs {
|
|||||||
max_anisotropy: u16,
|
max_anisotropy: u16,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_sampler(
|
pub fn op_webgpu_create_sampler(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateSamplerArgs,
|
#[serde] args: CreateSamplerArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -55,7 +56,7 @@ pub fn op_webgpu_create_sampler(
|
|||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
|
|
||||||
let descriptor = wgpu_core::resource::SamplerDescriptor {
|
let descriptor = wgpu_core::resource::SamplerDescriptor {
|
||||||
label: args.label.map(Cow::from),
|
label: Some(Cow::Owned(args.label)),
|
||||||
address_modes: [
|
address_modes: [
|
||||||
args.address_mode_u,
|
args.address_mode_u,
|
||||||
args.address_mode_v,
|
args.address_mode_v,
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -25,12 +25,13 @@ impl Resource for WebGpuShaderModule {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_shader_module(
|
pub fn op_webgpu_create_shader_module(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
label: Option<String>,
|
#[string] label: Cow<str>,
|
||||||
code: String,
|
#[string] code: Cow<str>,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -38,10 +39,10 @@ pub fn op_webgpu_create_shader_module(
|
|||||||
.get::<super::WebGpuDevice>(device_rid)?;
|
.get::<super::WebGpuDevice>(device_rid)?;
|
||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
|
|
||||||
let source = wgpu_core::pipeline::ShaderModuleSource::Wgsl(Cow::from(code));
|
let source = wgpu_core::pipeline::ShaderModuleSource::Wgsl(code);
|
||||||
|
|
||||||
let descriptor = wgpu_core::pipeline::ShaderModuleDescriptor {
|
let descriptor = wgpu_core::pipeline::ShaderModuleDescriptor {
|
||||||
label: label.map(Cow::from),
|
label: Some(label),
|
||||||
shader_bound_checks: wgpu_types::ShaderBoundChecks::default(),
|
shader_bound_checks: wgpu_types::ShaderBoundChecks::default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
use super::WebGpuResult;
|
use super::WebGpuResult;
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -51,10 +51,11 @@ pub struct SurfaceConfigureArgs {
|
|||||||
view_formats: Vec<wgpu_types::TextureFormat>,
|
view_formats: Vec<wgpu_types::TextureFormat>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_surface_configure(
|
pub fn op_webgpu_surface_configure(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: SurfaceConfigureArgs,
|
#[serde] args: SurfaceConfigureArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -81,11 +82,12 @@ pub fn op_webgpu_surface_configure(
|
|||||||
Ok(WebGpuResult::maybe_err(err))
|
Ok(WebGpuResult::maybe_err(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_surface_get_current_texture(
|
pub fn op_webgpu_surface_get_current_texture(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
surface_rid: ResourceId,
|
#[smi] surface_rid: ResourceId,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -111,11 +113,11 @@ pub fn op_webgpu_surface_get_current_texture(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2(fast)]
|
||||||
pub fn op_webgpu_surface_present(
|
pub fn op_webgpu_surface_present(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
device_rid: ResourceId,
|
#[smi] device_rid: ResourceId,
|
||||||
surface_rid: ResourceId,
|
#[smi] surface_rid: ResourceId,
|
||||||
) -> Result<(), AnyError> {
|
) -> Result<(), AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use deno_core::error::AnyError;
|
use deno_core::error::AnyError;
|
||||||
use deno_core::op;
|
use deno_core::op2;
|
||||||
use deno_core::OpState;
|
use deno_core::OpState;
|
||||||
use deno_core::Resource;
|
use deno_core::Resource;
|
||||||
use deno_core::ResourceId;
|
use deno_core::ResourceId;
|
||||||
@ -48,7 +48,7 @@ impl Resource for WebGpuTextureView {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateTextureArgs {
|
pub struct CreateTextureArgs {
|
||||||
device_rid: ResourceId,
|
device_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
size: wgpu_types::Extent3d,
|
size: wgpu_types::Extent3d,
|
||||||
mip_level_count: u32,
|
mip_level_count: u32,
|
||||||
sample_count: u32,
|
sample_count: u32,
|
||||||
@ -58,10 +58,11 @@ pub struct CreateTextureArgs {
|
|||||||
view_formats: Vec<wgpu_types::TextureFormat>,
|
view_formats: Vec<wgpu_types::TextureFormat>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_texture(
|
pub fn op_webgpu_create_texture(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateTextureArgs,
|
#[serde] args: CreateTextureArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let device_resource = state
|
let device_resource = state
|
||||||
@ -70,7 +71,7 @@ pub fn op_webgpu_create_texture(
|
|||||||
let device = device_resource.1;
|
let device = device_resource.1;
|
||||||
|
|
||||||
let descriptor = wgpu_core::resource::TextureDescriptor {
|
let descriptor = wgpu_core::resource::TextureDescriptor {
|
||||||
label: args.label.map(Cow::from),
|
label: Some(Cow::Owned(args.label)),
|
||||||
size: args.size,
|
size: args.size,
|
||||||
mip_level_count: args.mip_level_count,
|
mip_level_count: args.mip_level_count,
|
||||||
sample_count: args.sample_count,
|
sample_count: args.sample_count,
|
||||||
@ -99,17 +100,18 @@ pub fn op_webgpu_create_texture(
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct CreateTextureViewArgs {
|
pub struct CreateTextureViewArgs {
|
||||||
texture_rid: ResourceId,
|
texture_rid: ResourceId,
|
||||||
label: Option<String>,
|
label: String,
|
||||||
format: Option<wgpu_types::TextureFormat>,
|
format: Option<wgpu_types::TextureFormat>,
|
||||||
dimension: Option<wgpu_types::TextureViewDimension>,
|
dimension: Option<wgpu_types::TextureViewDimension>,
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
range: wgpu_types::ImageSubresourceRange,
|
range: wgpu_types::ImageSubresourceRange,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[op]
|
#[op2]
|
||||||
|
#[serde]
|
||||||
pub fn op_webgpu_create_texture_view(
|
pub fn op_webgpu_create_texture_view(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
args: CreateTextureViewArgs,
|
#[serde] args: CreateTextureViewArgs,
|
||||||
) -> Result<WebGpuResult, AnyError> {
|
) -> Result<WebGpuResult, AnyError> {
|
||||||
let instance = state.borrow::<super::Instance>();
|
let instance = state.borrow::<super::Instance>();
|
||||||
let texture_resource = state
|
let texture_resource = state
|
||||||
@ -118,7 +120,7 @@ pub fn op_webgpu_create_texture_view(
|
|||||||
let texture = texture_resource.id;
|
let texture = texture_resource.id;
|
||||||
|
|
||||||
let descriptor = wgpu_core::resource::TextureViewDescriptor {
|
let descriptor = wgpu_core::resource::TextureViewDescriptor {
|
||||||
label: args.label.map(Cow::from),
|
label: Some(Cow::Owned(args.label)),
|
||||||
format: args.format,
|
format: args.format,
|
||||||
dimension: args.dimension,
|
dimension: args.dimension,
|
||||||
range: args.range,
|
range: args.range,
|
||||||
|
|||||||
@ -3,7 +3,7 @@ interface mixin GPUObjectBase {
|
|||||||
};
|
};
|
||||||
|
|
||||||
dictionary GPUObjectDescriptorBase {
|
dictionary GPUObjectDescriptorBase {
|
||||||
USVString label;
|
USVString label = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
[Exposed=(Window, DedicatedWorker), SecureContext]
|
[Exposed=(Window, DedicatedWorker), SecureContext]
|
||||||
@ -563,7 +563,8 @@ interface GPUPipelineLayout {
|
|||||||
};
|
};
|
||||||
GPUPipelineLayout includes GPUObjectBase;
|
GPUPipelineLayout includes GPUObjectBase;
|
||||||
|
|
||||||
dictionary GPUPipelineLayoutDescriptor : GPUObjectDescriptorBase {
|
dictionary GPUPipelineLayoutDescriptor
|
||||||
|
: GPUObjectDescriptorBase {
|
||||||
required sequence<GPUBindGroupLayout> bindGroupLayouts;
|
required sequence<GPUBindGroupLayout> bindGroupLayouts;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -572,7 +573,8 @@ interface GPUShaderModule {
|
|||||||
};
|
};
|
||||||
GPUShaderModule includes GPUObjectBase;
|
GPUShaderModule includes GPUObjectBase;
|
||||||
|
|
||||||
dictionary GPUShaderModuleDescriptor : GPUObjectDescriptorBase {
|
dictionary GPUShaderModuleDescriptor
|
||||||
|
: GPUObjectDescriptorBase {
|
||||||
required USVString code;
|
required USVString code;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -935,11 +937,6 @@ interface GPUComputePassEncoder {
|
|||||||
undefined dispatchWorkgroups(GPUSize32 workgroupCountX, optional GPUSize32 workgroupCountY = 1, optional GPUSize32 workgroupCountZ = 1);
|
undefined dispatchWorkgroups(GPUSize32 workgroupCountX, optional GPUSize32 workgroupCountY = 1, optional GPUSize32 workgroupCountZ = 1);
|
||||||
undefined dispatchWorkgroupsIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
|
undefined dispatchWorkgroupsIndirect(GPUBuffer indirectBuffer, GPUSize64 indirectOffset);
|
||||||
|
|
||||||
undefined beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
|
|
||||||
undefined endPipelineStatisticsQuery();
|
|
||||||
|
|
||||||
undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
|
|
||||||
|
|
||||||
undefined end();
|
undefined end();
|
||||||
};
|
};
|
||||||
GPUComputePassEncoder includes GPUObjectBase;
|
GPUComputePassEncoder includes GPUObjectBase;
|
||||||
@ -947,8 +944,15 @@ GPUComputePassEncoder includes GPUCommandsMixin;
|
|||||||
GPUComputePassEncoder includes GPUDebugCommandsMixin;
|
GPUComputePassEncoder includes GPUDebugCommandsMixin;
|
||||||
GPUComputePassEncoder includes GPUBindingCommandsMixin;
|
GPUComputePassEncoder includes GPUBindingCommandsMixin;
|
||||||
|
|
||||||
|
dictionary GPUComputePassTimestampWrites {
|
||||||
|
required GPUQuerySet querySet;
|
||||||
|
GPUSize32 beginningOfPassWriteIndex;
|
||||||
|
GPUSize32 endOfPassWriteIndex;
|
||||||
|
};
|
||||||
|
|
||||||
dictionary GPUComputePassDescriptor
|
dictionary GPUComputePassDescriptor
|
||||||
: GPUObjectDescriptorBase {
|
: GPUObjectDescriptorBase {
|
||||||
|
GPUComputePassTimestampWrites timestampWrites;
|
||||||
};
|
};
|
||||||
|
|
||||||
[Exposed=(Window, DedicatedWorker), SecureContext]
|
[Exposed=(Window, DedicatedWorker), SecureContext]
|
||||||
@ -963,10 +967,8 @@ interface GPURenderPassEncoder {
|
|||||||
undefined setBlendConstant(GPUColor color);
|
undefined setBlendConstant(GPUColor color);
|
||||||
undefined setStencilReference(GPUStencilValue reference);
|
undefined setStencilReference(GPUStencilValue reference);
|
||||||
|
|
||||||
undefined beginPipelineStatisticsQuery(GPUQuerySet querySet, GPUSize32 queryIndex);
|
undefined beginOcclusionQuery(GPUSize32 queryIndex);
|
||||||
undefined endPipelineStatisticsQuery();
|
undefined endOcclusionQuery();
|
||||||
|
|
||||||
undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
|
|
||||||
|
|
||||||
undefined executeBundles(sequence<GPURenderBundle> bundles);
|
undefined executeBundles(sequence<GPURenderBundle> bundles);
|
||||||
undefined end();
|
undefined end();
|
||||||
@ -977,11 +979,18 @@ GPURenderPassEncoder includes GPUDebugCommandsMixin;
|
|||||||
GPURenderPassEncoder includes GPUBindingCommandsMixin;
|
GPURenderPassEncoder includes GPUBindingCommandsMixin;
|
||||||
GPURenderPassEncoder includes GPURenderCommandsMixin;
|
GPURenderPassEncoder includes GPURenderCommandsMixin;
|
||||||
|
|
||||||
|
dictionary GPURenderPassTimestampWrites {
|
||||||
|
required GPUQuerySet querySet;
|
||||||
|
GPUSize32 beginningOfPassWriteIndex;
|
||||||
|
GPUSize32 endOfPassWriteIndex;
|
||||||
|
};
|
||||||
|
|
||||||
dictionary GPURenderPassDescriptor
|
dictionary GPURenderPassDescriptor
|
||||||
: GPUObjectDescriptorBase {
|
: GPUObjectDescriptorBase {
|
||||||
required sequence<GPURenderPassColorAttachment?> colorAttachments;
|
required sequence<GPURenderPassColorAttachment?> colorAttachments;
|
||||||
GPURenderPassDepthStencilAttachment depthStencilAttachment;
|
GPURenderPassDepthStencilAttachment depthStencilAttachment;
|
||||||
GPUQuerySet occlusionQuerySet;
|
GPUQuerySet occlusionQuerySet;
|
||||||
|
GPURenderPassTimestampWrites timestampWrites;
|
||||||
};
|
};
|
||||||
|
|
||||||
dictionary GPURenderPassColorAttachment {
|
dictionary GPURenderPassColorAttachment {
|
||||||
@ -1100,23 +1109,13 @@ dictionary GPUQuerySetDescriptor
|
|||||||
: GPUObjectDescriptorBase {
|
: GPUObjectDescriptorBase {
|
||||||
required GPUQueryType type;
|
required GPUQueryType type;
|
||||||
required GPUSize32 count;
|
required GPUSize32 count;
|
||||||
sequence<GPUPipelineStatisticName> pipelineStatistics = [];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum GPUQueryType {
|
enum GPUQueryType {
|
||||||
"occlusion",
|
"occlusion",
|
||||||
"pipeline-statistics",
|
|
||||||
"timestamp",
|
"timestamp",
|
||||||
};
|
};
|
||||||
|
|
||||||
enum GPUPipelineStatisticName {
|
|
||||||
"vertex-shader-invocations",
|
|
||||||
"clipper-invocations",
|
|
||||||
"clipper-primitives-out",
|
|
||||||
"fragment-shader-invocations",
|
|
||||||
"compute-shader-invocations",
|
|
||||||
};
|
|
||||||
|
|
||||||
[Exposed=(Window, DedicatedWorker), SecureContext]
|
[Exposed=(Window, DedicatedWorker), SecureContext]
|
||||||
interface GPUCanvasContext {
|
interface GPUCanvasContext {
|
||||||
readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
|
readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
|
||||||
|
|||||||
@ -85,10 +85,10 @@
|
|||||||
dst: Id(0, 1, Empty),
|
dst: Id(0, 1, Empty),
|
||||||
subresource_range: ImageSubresourceRange(
|
subresource_range: ImageSubresourceRange(
|
||||||
aspect: all,
|
aspect: all,
|
||||||
base_mip_level: 0,
|
baseMipLevel: 0,
|
||||||
mip_level_count: None,
|
mipLevelCount: None,
|
||||||
base_array_layer: 0,
|
baseArrayLayer: 0,
|
||||||
array_layer_count: None,
|
arrayLayerCount: None,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
CopyTextureToBuffer(
|
CopyTextureToBuffer(
|
||||||
|
|||||||
@ -5,6 +5,6 @@
|
|||||||
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
|
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
|
||||||
|
|
||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.70"
|
channel = "1.70" # Needed for deno & cts_runner. Firefox's MSRV is 1.65
|
||||||
components = ["rustfmt", "clippy"]
|
components = ["rustfmt", "clippy"]
|
||||||
targets = ["wasm32-unknown-unknown"]
|
targets = ["wasm32-unknown-unknown"]
|
||||||
|
|||||||
@ -6147,6 +6147,7 @@ impl<T: Copy> ImageCopyTextureTagged<T> {
|
|||||||
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
|
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
|
||||||
#[cfg_attr(feature = "trace", derive(serde::Serialize))]
|
#[cfg_attr(feature = "trace", derive(serde::Serialize))]
|
||||||
#[cfg_attr(feature = "replay", derive(serde::Deserialize))]
|
#[cfg_attr(feature = "replay", derive(serde::Deserialize))]
|
||||||
|
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
|
||||||
pub struct ImageSubresourceRange {
|
pub struct ImageSubresourceRange {
|
||||||
/// Aspect of the texture. Color textures must be [`TextureAspect::All`][TAA].
|
/// Aspect of the texture. Color textures must be [`TextureAspect::All`][TAA].
|
||||||
///
|
///
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user