From e54ffb963ceaca81d37224ba751b19c70f8aba8c Mon Sep 17 00:00:00 2001 From: iwannabethedev Date: Tue, 2 May 2023 01:06:49 +0200 Subject: [PATCH] extension: Log used renderer. Log which renderer-backend was actually used in the browser console. --- render/canvas/src/lib.rs | 4 ++++ render/src/backend.rs | 4 ++++ render/src/backend/null.rs | 4 ++++ render/webgl/src/lib.rs | 4 ++++ render/wgpu/src/backend.rs | 4 ++++ web/packages/core/src/ruffle-player.ts | 11 +++++++++-- web/src/lib.rs | 5 +++++ 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/render/canvas/src/lib.rs b/render/canvas/src/lib.rs index 79a48cb10689..7cbcc07eb811 100644 --- a/render/canvas/src/lib.rs +++ b/render/canvas/src/lib.rs @@ -486,6 +486,10 @@ impl RenderBackend for WebCanvasRenderBackend { Cow::Borrowed("Renderer: Canvas") } + fn name(&self) -> &'static str { + "canvas" + } + fn set_quality(&mut self, _quality: StageQuality) {} } diff --git a/render/src/backend.rs b/render/src/backend.rs index e8056593eaa3..39e72bfe4502 100644 --- a/render/src/backend.rs +++ b/render/src/backend.rs @@ -67,6 +67,10 @@ pub trait RenderBackend: Downcast { fn context3d_present(&mut self, context: &mut dyn Context3D) -> Result<(), Error>; fn debug_info(&self) -> Cow<'static, str>; + /// An internal name that is used to identify the render-backend. + /// For valid values, look at: + /// web/packages/core/src/load-options.ts:RenderBackend + fn name(&self) -> &'static str; fn set_quality(&mut self, quality: StageQuality); } diff --git a/render/src/backend/null.rs b/render/src/backend/null.rs index 1b293c02cb1a..6295290842d5 100644 --- a/render/src/backend/null.rs +++ b/render/src/backend/null.rs @@ -93,5 +93,9 @@ impl RenderBackend for NullRenderer { Cow::Borrowed("Renderer: Null") } + fn name(&self) -> &'static str { + "" + } + fn set_quality(&mut self, _quality: StageQuality) {} } diff --git a/render/webgl/src/lib.rs b/render/webgl/src/lib.rs index 6d1c23d83ab9..08327c43b841 100644 --- a/render/webgl/src/lib.rs +++ b/render/webgl/src/lib.rs @@ -1101,6 +1101,10 @@ impl RenderBackend for WebGlRenderBackend { Cow::Owned(result.join("\n")) } + fn name(&self) -> &'static str { + "webgl" + } + fn set_quality(&mut self, _quality: StageQuality) {} } diff --git a/render/wgpu/src/backend.rs b/render/wgpu/src/backend.rs index 18f44a0ee92c..d0effc2a31f9 100644 --- a/render/wgpu/src/backend.rs +++ b/render/wgpu/src/backend.rs @@ -378,6 +378,10 @@ impl RenderBackend for WgpuRenderBackend { Cow::Owned(result.join("\n")) } + fn name(&self) -> &'static str { + "webgpu" + } + fn set_quality(&mut self, quality: StageQuality) { self.surface = Surface::new( &self.descriptors, diff --git a/web/packages/core/src/ruffle-player.ts b/web/packages/core/src/ruffle-player.ts index 75e0c545b04a..4b3507a6a232 100644 --- a/web/packages/core/src/ruffle-player.ts +++ b/web/packages/core/src/ruffle-player.ts @@ -511,10 +511,17 @@ export class RufflePlayer extends HTMLElement { this.loadedConfig ); this._cachedDebugInfo = this.instance!.renderer_debug_info(); + + const actuallyUsedRendererName = this.instance!.renderer_name(); + console.log( - "New Ruffle instance created (WebAssembly extensions: " + + "%c" + + "New Ruffle instance created (WebAssembly extensions: " + (ruffleConstructor.is_wasm_simd_used() ? "ON" : "OFF") + - ")" + " | Used renderer: " + + (actuallyUsedRendererName ?? "") + + ")", + "background: #37528C; color: #FFAD33" ); // In Firefox, AudioContext.state is always "suspended" when the object has just been created. diff --git a/web/src/lib.rs b/web/src/lib.rs index da6804fdc8a4..604107047342 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -378,6 +378,11 @@ impl Ruffle { .unwrap_or(JsValue::NULL) } + pub fn renderer_name(&self) -> JsValue { + self.with_core(|core| JsValue::from_str(core.renderer().name())) + .unwrap_or(JsValue::NULL) + } + // after the context menu is closed, remember to call `clear_custom_menu_items`! pub fn prepare_context_menu(&mut self) -> JsValue { self.with_core_mut(|core| {