mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Update wgpu and impl WGSLLanguageFeatures
(#34928)
* Update wgpu and impl `WGSLLanguageFeatures`
dc9b2eb718
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
* Update expectations
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
---------
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
parent
7ac0dfb5b5
commit
4e51c7be43
9 changed files with 148 additions and 659 deletions
44
Cargo.lock
generated
44
Cargo.lock
generated
|
@ -4449,8 +4449,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "metal"
|
||||
version = "0.30.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c3572083504c43e14aec05447f8a3d57cce0f66d7a3c1b9058572eca4d70ab9"
|
||||
source = "git+https://github.com/gfx-rs/metal-rs.git?rev=ef768ff9d7#ef768ff9d742ae6a0f4e83ddc8031264e7d460c4"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"block",
|
||||
|
@ -4594,7 +4593,7 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
|
|||
[[package]]
|
||||
name = "naga"
|
||||
version = "23.0.0"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bit-set",
|
||||
|
@ -4606,6 +4605,7 @@ dependencies = [
|
|||
"log",
|
||||
"rustc-hash 1.1.0",
|
||||
"spirv",
|
||||
"strum",
|
||||
"termcolor",
|
||||
"thiserror 2.0.9",
|
||||
"unicode-xid",
|
||||
|
@ -5304,6 +5304,15 @@ dependencies = [
|
|||
"libredox",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordered-float"
|
||||
version = "4.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordermap"
|
||||
version = "0.3.5"
|
||||
|
@ -7028,6 +7037,28 @@ version = "0.11.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
version = "0.26.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
|
||||
dependencies = [
|
||||
"strum_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.26.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustversion",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "style"
|
||||
version = "0.0.1"
|
||||
|
@ -8466,7 +8497,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
|
|||
[[package]]
|
||||
name = "wgpu-core"
|
||||
version = "23.0.1"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bit-vec",
|
||||
|
@ -8490,7 +8521,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "wgpu-hal"
|
||||
version = "23.0.1"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"arrayvec",
|
||||
|
@ -8516,6 +8547,7 @@ dependencies = [
|
|||
"ndk-sys 0.5.0+25.2.9519653",
|
||||
"objc",
|
||||
"once_cell",
|
||||
"ordered-float",
|
||||
"parking_lot",
|
||||
"profiling",
|
||||
"range-alloc",
|
||||
|
@ -8533,7 +8565,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "wgpu-types"
|
||||
version = "23.0.0"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93#0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93"
|
||||
source = "git+https://github.com/gfx-rs/wgpu?rev=dc9b2eb71807ccafb7414425f1f8f24b5691685d#dc9b2eb71807ccafb7414425f1f8f24b5691685d"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"js-sys",
|
||||
|
|
|
@ -159,8 +159,8 @@ webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" }
|
|||
webrender_traits = { path = "components/shared/webrender" }
|
||||
webxr = { git = "https://github.com/servo/webxr" }
|
||||
webxr-api = { git = "https://github.com/servo/webxr" }
|
||||
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" }
|
||||
wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "0f5f0580e4cb2fd2feac0e8ed7e8d3050e4d9c93" }
|
||||
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "dc9b2eb71807ccafb7414425f1f8f24b5691685d" }
|
||||
wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "dc9b2eb71807ccafb7414425f1f8f24b5691685d" }
|
||||
windows-sys = "0.59"
|
||||
wr_malloc_size_of = { git = "https://github.com/servo/webrender", branch = "0.65" }
|
||||
xi-unicode = "0.3.0"
|
||||
|
|
|
@ -170,7 +170,7 @@ DOMInterfaces = {
|
|||
|
||||
'GPU': {
|
||||
'inRealms': ['RequestAdapter'],
|
||||
'canGc': ['RequestAdapter'],
|
||||
'canGc': ['RequestAdapter', 'WgslLanguageFeatures'],
|
||||
},
|
||||
|
||||
'GPUAdapter': {
|
||||
|
|
|
@ -12,13 +12,14 @@ use script_traits::ScriptMsg;
|
|||
use webgpu::wgt::PowerPreference;
|
||||
use webgpu::{wgc, WebGPUResponse};
|
||||
|
||||
use super::wgsllanguagefeatures::WGSLLanguageFeatures;
|
||||
use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{
|
||||
GPUMethods, GPUPowerPreference, GPURequestAdapterOptions, GPUTextureFormat,
|
||||
};
|
||||
use crate::dom::bindings::error::Error;
|
||||
use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
|
||||
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
use crate::dom::promise::Promise;
|
||||
|
@ -30,12 +31,15 @@ use crate::script_runtime::CanGc;
|
|||
#[allow(clippy::upper_case_acronyms)]
|
||||
pub(crate) struct GPU {
|
||||
reflector_: Reflector,
|
||||
/// Same object for <https://www.w3.org/TR/webgpu/#dom-gpu-wgsllanguagefeatures>
|
||||
wgsl_language_features: MutNullableDom<WGSLLanguageFeatures>,
|
||||
}
|
||||
|
||||
impl GPU {
|
||||
pub(crate) fn new_inherited() -> GPU {
|
||||
GPU {
|
||||
reflector_: Reflector::new(),
|
||||
wgsl_language_features: MutNullableDom::default(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -133,11 +137,17 @@ impl GPUMethods<crate::DomTypeHolder> for GPU {
|
|||
promise
|
||||
}
|
||||
|
||||
// https://gpuweb.github.io/gpuweb/#dom-gpu-getpreferredcanvasformat
|
||||
/// <https://gpuweb.github.io/gpuweb/#dom-gpu-getpreferredcanvasformat>
|
||||
fn GetPreferredCanvasFormat(&self) -> GPUTextureFormat {
|
||||
// TODO: real implementation
|
||||
GPUTextureFormat::Rgba8unorm
|
||||
}
|
||||
|
||||
/// <https://www.w3.org/TR/webgpu/#dom-gpu-wgsllanguagefeatures>
|
||||
fn WgslLanguageFeatures(&self, can_gc: CanGc) -> DomRoot<WGSLLanguageFeatures> {
|
||||
self.wgsl_language_features
|
||||
.or_init(|| WGSLLanguageFeatures::new(&self.global(), None, can_gc))
|
||||
}
|
||||
}
|
||||
|
||||
impl AsyncWGPUListener for GPU {
|
||||
|
|
|
@ -45,3 +45,4 @@ pub(crate) mod gpuuncapturederrorevent;
|
|||
pub(crate) mod gpuvalidationerror;
|
||||
#[allow(dead_code)]
|
||||
pub(crate) mod identityhub;
|
||||
pub(crate) mod wgsllanguagefeatures;
|
||||
|
|
86
components/script/dom/webgpu/wgsllanguagefeatures.rs
Normal file
86
components/script/dom/webgpu/wgsllanguagefeatures.rs
Normal file
|
@ -0,0 +1,86 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// check-tidy: no specs after this line
|
||||
|
||||
use dom_struct::dom_struct;
|
||||
use indexmap::IndexSet;
|
||||
use js::rust::HandleObject;
|
||||
use webgpu::wgc::naga::front::wgsl::ImplementedLanguageExtension;
|
||||
|
||||
use crate::dom::bindings::cell::DomRefCell;
|
||||
use crate::dom::bindings::codegen::Bindings::WebGPUBinding::WGSLLanguageFeaturesMethods;
|
||||
use crate::dom::bindings::like::Setlike;
|
||||
use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector};
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
use crate::script_runtime::CanGc;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct WGSLLanguageFeatures {
|
||||
reflector: Reflector,
|
||||
// internal storage for features
|
||||
#[custom_trace]
|
||||
internal: DomRefCell<IndexSet<DOMString>>,
|
||||
}
|
||||
|
||||
impl WGSLLanguageFeatures {
|
||||
pub(crate) fn new(
|
||||
global: &GlobalScope,
|
||||
proto: Option<HandleObject>,
|
||||
can_gc: CanGc,
|
||||
) -> DomRoot<Self> {
|
||||
let set = ImplementedLanguageExtension::all()
|
||||
.iter()
|
||||
.map(|le| le.to_ident().into())
|
||||
.collect();
|
||||
reflect_dom_object_with_proto(
|
||||
Box::new(Self {
|
||||
reflector: Reflector::new(),
|
||||
internal: DomRefCell::new(set),
|
||||
}),
|
||||
global,
|
||||
proto,
|
||||
can_gc,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl WGSLLanguageFeaturesMethods<crate::DomTypeHolder> for WGSLLanguageFeatures {
|
||||
fn Size(&self) -> u32 {
|
||||
self.internal.size()
|
||||
}
|
||||
}
|
||||
|
||||
// this error is wrong because if we inline Self::Key and Self::Value all errors are gone
|
||||
#[allow(crown::unrooted_must_root)]
|
||||
impl Setlike for WGSLLanguageFeatures {
|
||||
type Key = DOMString;
|
||||
|
||||
#[inline(always)]
|
||||
fn get_index(&self, index: u32) -> Option<Self::Key> {
|
||||
self.internal.get_index(index)
|
||||
}
|
||||
#[inline(always)]
|
||||
fn size(&self) -> u32 {
|
||||
self.internal.size()
|
||||
}
|
||||
#[inline(always)]
|
||||
fn add(&self, _key: Self::Key) {
|
||||
unreachable!("readonly");
|
||||
}
|
||||
#[inline(always)]
|
||||
fn has(&self, key: Self::Key) -> bool {
|
||||
self.internal.has(key)
|
||||
}
|
||||
#[inline(always)]
|
||||
fn clear(&self) {
|
||||
unreachable!("readonly");
|
||||
}
|
||||
#[inline(always)]
|
||||
fn delete(&self, _key: Self::Key) -> bool {
|
||||
unreachable!("readonly");
|
||||
}
|
||||
}
|
|
@ -57,6 +57,11 @@ interface GPUSupportedFeatures {
|
|||
readonly setlike<DOMString>;
|
||||
};
|
||||
|
||||
[Exposed=(Window, DedicatedWorker), Pref="dom.webgpu.enabled"]
|
||||
interface WGSLLanguageFeatures {
|
||||
readonly setlike<DOMString>;
|
||||
};
|
||||
|
||||
[Exposed=(Window, DedicatedWorker), Pref="dom.webgpu.enabled"]
|
||||
interface GPUAdapterInfo {
|
||||
readonly attribute DOMString vendor;
|
||||
|
@ -77,6 +82,7 @@ interface GPU {
|
|||
[NewObject]
|
||||
Promise<GPUAdapter?> requestAdapter(optional GPURequestAdapterOptions options = {});
|
||||
GPUTextureFormat getPreferredCanvasFormat();
|
||||
[SameObject] readonly attribute WGSLLanguageFeatures wgslLanguageFeatures;
|
||||
};
|
||||
|
||||
dictionary GPURequestAdapterOptions {
|
||||
|
|
|
@ -139,7 +139,7 @@ impl WGPU {
|
|||
};
|
||||
let global = Arc::new(wgc::global::Global::new(
|
||||
"wgpu-core",
|
||||
InstanceDescriptor {
|
||||
&InstanceDescriptor {
|
||||
backends,
|
||||
..Default::default()
|
||||
},
|
||||
|
|
648
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
648
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue