remove all the excessive configs
diff --git a/sparse_strips/vello_hybrid/examples/native_webgl/src/lib.rs b/sparse_strips/vello_hybrid/examples/native_webgl/src/lib.rs
index 4914cde..c39a3e2 100644
--- a/sparse_strips/vello_hybrid/examples/native_webgl/src/lib.rs
+++ b/sparse_strips/vello_hybrid/examples/native_webgl/src/lib.rs
@@ -7,28 +7,20 @@
clippy::cast_possible_truncation,
reason = "truncation has no appreciable impact in this demo"
)]
+#![cfg(target_arch = "wasm32")]
-#[cfg(target_arch = "wasm32")]
use std::cell::RefCell;
-#[cfg(target_arch = "wasm32")]
use std::rc::Rc;
-#[cfg(target_arch = "wasm32")]
use vello_common::kurbo::{Affine, Vec2};
-#[cfg(target_arch = "wasm32")]
use vello_hybrid_scenes::AnyScene;
-#[cfg(target_arch = "wasm32")]
use wasm_bindgen::prelude::*;
-#[cfg(target_arch = "wasm32")]
use web_sys::{Event, HtmlCanvasElement, KeyboardEvent, MouseEvent, WheelEvent};
-#[cfg(target_arch = "wasm32")]
struct RendererWrapper {
renderer: vello_hybrid::WebGlRenderer,
}
-#[cfg(target_arch = "wasm32")]
impl RendererWrapper {
- #[cfg(target_arch = "wasm32")]
fn new(canvas: web_sys::HtmlCanvasElement) -> Self {
let renderer = vello_hybrid::WebGlRenderer::new(&canvas);
@@ -37,7 +29,6 @@
}
/// State that handles scene rendering and interactions
-#[cfg(target_arch = "wasm32")]
struct AppState {
scenes: Box<[AnyScene]>,
current_scene: usize,
@@ -52,7 +43,6 @@
canvas: HtmlCanvasElement,
}
-#[cfg(target_arch = "wasm32")]
impl AppState {
fn new(canvas: HtmlCanvasElement, scenes: Box<[AnyScene]>) -> Self {
let width = canvas.width();
@@ -182,7 +172,6 @@
}
}
-#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_name = requestAnimationFrame)]
@@ -191,7 +180,6 @@
/// Creates a `HTMLCanvasElement` of the given dimensions and renders the given scenes into it,
/// with interactive controls for panning, zooming, and switching between scenes.
-#[cfg(target_arch = "wasm32")]
pub async fn run_interactive(canvas_width: u16, canvas_height: u16) {
let canvas = web_sys::Window::document(&web_sys::window().unwrap())
.unwrap()
@@ -359,7 +347,6 @@
}
/// Creates a `HTMLCanvasElement` and renders a single scene into it
-#[cfg(target_arch = "wasm32")]
pub async fn render_scene(scene: vello_hybrid::Scene, width: u16, height: u16) {
let canvas = web_sys::Window::document(&web_sys::window().unwrap())
.unwrap()
diff --git a/sparse_strips/vello_hybrid/examples/native_webgl/tests/webgl.rs b/sparse_strips/vello_hybrid/examples/native_webgl/tests/webgl.rs
index 3d85b9e..84184d8 100644
--- a/sparse_strips/vello_hybrid/examples/native_webgl/tests/webgl.rs
+++ b/sparse_strips/vello_hybrid/examples/native_webgl/tests/webgl.rs
@@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT
//! Tests whether the WebGL example compiles and runs without panicking.
+#![cfg(target_arch = "wasm32")]
-#[cfg(target_arch = "wasm32")]
mod wasm {
use native_webgl::render_scene;
use vello_common::peniko::{color::palette, kurbo::BezPath};
diff --git a/sparse_strips/vello_hybrid/examples/wgpu_webgl/src/lib.rs b/sparse_strips/vello_hybrid/examples/wgpu_webgl/src/lib.rs
index 5ea0d92..f54ec06 100644
--- a/sparse_strips/vello_hybrid/examples/wgpu_webgl/src/lib.rs
+++ b/sparse_strips/vello_hybrid/examples/wgpu_webgl/src/lib.rs
@@ -7,21 +7,15 @@
clippy::cast_possible_truncation,
reason = "truncation has no appreciable impact in this demo"
)]
+#![cfg(target_arch = "wasm32")]
-#[cfg(target_arch = "wasm32")]
use std::cell::RefCell;
-#[cfg(target_arch = "wasm32")]
use std::rc::Rc;
-#[cfg(target_arch = "wasm32")]
use vello_common::kurbo::{Affine, Point};
-#[cfg(target_arch = "wasm32")]
use vello_hybrid_scenes::AnyScene;
-#[cfg(target_arch = "wasm32")]
use wasm_bindgen::prelude::*;
-#[cfg(target_arch = "wasm32")]
use web_sys::{Event, HtmlCanvasElement, KeyboardEvent, MouseEvent, WheelEvent};
-#[cfg(target_arch = "wasm32")]
struct RendererWrapper {
renderer: vello_hybrid::Renderer,
device: wgpu::Device,
@@ -29,9 +23,7 @@
surface: wgpu::Surface<'static>,
}
-#[cfg(target_arch = "wasm32")]
impl RendererWrapper {
- #[cfg(target_arch = "wasm32")]
async fn new(canvas: web_sys::HtmlCanvasElement) -> Self {
let width = canvas.width();
let height = canvas.height();
@@ -117,7 +109,6 @@
}
/// State that handles scene rendering and interactions
-#[cfg(target_arch = "wasm32")]
struct AppState {
scenes: Box<[AnyScene]>,
current_scene: usize,
@@ -132,7 +123,6 @@
canvas: HtmlCanvasElement,
}
-#[cfg(target_arch = "wasm32")]
impl AppState {
async fn new(canvas: HtmlCanvasElement, scenes: Box<[AnyScene]>) -> Self {
let width = canvas.width();
@@ -271,7 +261,6 @@
}
}
-#[cfg(target_arch = "wasm32")]
#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_name = requestAnimationFrame)]
@@ -280,7 +269,6 @@
/// Creates a `HTMLCanvasElement` of the given dimensions and renders the given scenes into it,
/// with interactive controls for panning, zooming, and switching between scenes.
-#[cfg(target_arch = "wasm32")]
pub async fn run_interactive(canvas_width: u16, canvas_height: u16) {
let canvas = web_sys::Window::document(&web_sys::window().unwrap())
.unwrap()
@@ -453,7 +441,6 @@
}
/// Creates a `HTMLCanvasElement` and renders a single scene into it
-#[cfg(target_arch = "wasm32")]
pub async fn render_scene(scene: vello_hybrid::Scene, width: u16, height: u16) {
let canvas = web_sys::Window::document(&web_sys::window().unwrap())
.unwrap()
diff --git a/sparse_strips/vello_hybrid/examples/wgpu_webgl/tests/webgl.rs b/sparse_strips/vello_hybrid/examples/wgpu_webgl/tests/webgl.rs
index df9f244..fc8291b 100644
--- a/sparse_strips/vello_hybrid/examples/wgpu_webgl/tests/webgl.rs
+++ b/sparse_strips/vello_hybrid/examples/wgpu_webgl/tests/webgl.rs
@@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT
//! Tests whether the WebGL example compiles and runs without panicking.
+#![cfg(target_arch = "wasm32")]
-#[cfg(target_arch = "wasm32")]
mod wasm {
use vello_common::peniko::{color::palette, kurbo::BezPath};
use wasm_bindgen_test::*;