From 8f207c0f3f3a43d77e0c88cfdc840b4b742b9708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Thu, 9 Mar 2023 10:56:19 -0400 Subject: refactor: Split extension registration for runtime and snapshotting (#18095) This commit splits "::init" functions into "init_ops" and "init_ops_and_esm". That way we don't have to construct list of ESM sources on each startup if we're running with a snapshot. In a follow up commit "deno_core" will be changed to not have a split between "extensions" and "extensions_with_js" - it will be embedders' responsibility to pass appropriately configured extensions. Prerequisite for https://github.com/denoland/deno/pull/18080 --- ext/webgpu/lib.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'ext/webgpu') diff --git a/ext/webgpu/lib.rs b/ext/webgpu/lib.rs index aa6207d34..d399125c7 100644 --- a/ext/webgpu/lib.rs +++ b/ext/webgpu/lib.rs @@ -6,6 +6,7 @@ use deno_core::error::AnyError; use deno_core::include_js_files; use deno_core::op; use deno_core::Extension; +use deno_core::ExtensionBuilder; use deno_core::OpState; use deno_core::Resource; use deno_core::ResourceId; @@ -116,21 +117,31 @@ impl Resource for WebGpuQuerySet { } } -pub fn init(unstable: bool) -> Extension { +fn ext() -> ExtensionBuilder { Extension::builder_with_deps( env!("CARGO_PKG_NAME"), &["deno_webidl", "deno_web"], ) - .esm(include_js_files!("01_webgpu.js", "02_idl_types.js",)) - .ops(declare_webgpu_ops()) - .state(move |state| { +} + +fn ops(ext: &mut ExtensionBuilder, unstable: bool) -> &mut ExtensionBuilder { + ext.ops(declare_webgpu_ops()).state(move |state| { // TODO: check & possibly streamline this // Unstable might be able to be OpMiddleware // let unstable_checker = state.borrow::(); // let unstable = unstable_checker.unstable; state.put(Unstable(unstable)); }) - .build() +} + +pub fn init_ops_and_esm(unstable: bool) -> Extension { + ops(&mut ext(), unstable) + .esm(include_js_files!("01_webgpu.js", "02_idl_types.js",)) + .build() +} + +pub fn init_ops(unstable: bool) -> Extension { + ops(&mut ext(), unstable).build() } fn deserialize_features(features: &wgpu_types::Features) -> Vec<&'static str> { -- cgit v1.2.3