ci: Deny warnings on Web

As suggested in #6935 (review).

Author: relrelb

.github/workflows/test_web.yml

@@ -78,6 +78,7 @@ jobs:
 
       - name: Build
         env:
+          RUSTFLAGS: -D warnings
           # Verify that all features build.
           CARGO_FLAGS: --locked --all-features
         working-directory: web

exporter/src/main.rs

@@ -143,8 +143,7 @@ fn take_screenshot(
                     .renderer_mut()
                     .downcast_mut::<WgpuRenderBackend<TextureTarget>>()
                     .unwrap();
-                // Use straight alpha
-                renderer.capture_frame(false)
+                renderer.capture_frame()
             }) {
                 Ok(Some(image)) => result.push(image),
                 Ok(None) => return Err(anyhow!("Unable to capture frame {} of {:?}", i, swf_path)),

render/wgpu/src/backend.rs

@@ -131,7 +131,7 @@ impl WgpuRenderBackend<crate::target::TextureTarget> {
         Self::new(Arc::new(descriptors), target)
     }
 
-    pub fn capture_frame(&self, premultiplied_alpha: bool) -> Option<image::RgbaImage> {
+    pub fn capture_frame(&self) -> Option<image::RgbaImage> {
         use crate::utils::buffer_to_image;
         if let Some((buffer, dimensions)) = &self.target.buffer {
             Some(buffer_to_image(
@@ -140,7 +140,6 @@ impl WgpuRenderBackend<crate::target::TextureTarget> {
                 dimensions,
                 None,
                 self.target.size,
-                premultiplied_alpha,
             ))
         } else {
             None

render/wgpu/src/utils.rs

@@ -1,5 +1,4 @@
 use ruffle_render::quality::StageQuality;
-use ruffle_render::utils::unmultiply_alpha_rgba;
 use std::borrow::Cow;
 use std::mem::size_of;
 use std::num::NonZeroU32;
@@ -143,13 +142,13 @@ pub fn capture_image<R, F: FnOnce(&[u8], u32) -> R>(
     result
 }
 
+#[cfg(not(target_family = "wasm"))]
 pub fn buffer_to_image(
     device: &wgpu::Device,
     buffer: &wgpu::Buffer,
     dimensions: &BufferDimensions,
     index: Option<wgpu::SubmissionIndex>,
     size: wgpu::Extent3d,
-    premultiplied_alpha: bool,
 ) -> image::RgbaImage {
     capture_image(device, buffer, dimensions, index, |rgba, _buffer_width| {
         let mut bytes = Vec::with_capacity(dimensions.height * dimensions.unpadded_bytes_per_row);
@@ -160,9 +159,7 @@ pub fn buffer_to_image(
 
         // The image copied from the GPU uses premultiplied alpha, so
         // convert to straight alpha if requested by the user.
-        if !premultiplied_alpha {
-            unmultiply_alpha_rgba(&mut bytes);
-        }
+        ruffle_render::utils::unmultiply_alpha_rgba(&mut bytes);
 
         image::RgbaImage::from_raw(size.width, size.height, bytes)
             .expect("Retrieved texture buffer must be a valid RgbaImage")

tests/tests/util/runner.rs

@@ -178,10 +178,7 @@ pub fn run_swf(
                 .downcast_mut::<WgpuRenderBackend<TextureTarget>>()
                 .unwrap();
 
-            // Use straight alpha, since we want to save this as a PNG
-            let actual_image = renderer
-                .capture_frame(false)
-                .expect("Failed to capture image");
+            let actual_image = renderer.capture_frame().expect("Failed to capture image");
 
             let expected_image_path = base_path.join("expected.png");
             if expected_image_path.is_file() {

web/packages/core/package.json

@@ -19,12 +19,12 @@
         "//6": "# Enabling `build-std` would also be great, but it's not stable yet.",
         "prebuild": "npm run build:wasm-vanilla && npm run build:wasm-extensions",
 
-        "build:wasm-vanilla": "cross-env OUT_NAME=ruffle_web CARGO_PROFILE=web-vanilla-wasm RUSTFLAGS=\"--cfg=web_sys_unstable_apis -Aunknown_lints\" npm run build:wasm",
+        "build:wasm-vanilla": "cross-env OUT_NAME=ruffle_web CARGO_PROFILE=web-vanilla-wasm RUSTFLAGS=\"$RUSTFLAGS --cfg=web_sys_unstable_apis -Aunknown_lints\" npm run build:wasm",
 
         "//7": "# Dispatches to either building the real, or copying the fake (stand-in),",
         "//8": "# 'with-extensions' module.",
         "build:wasm-extensions": "node -e \"process.exit(process.env.ENABLE_WASM_EXTENSIONS == 'true' ? 0 : 1)\" && npm run build:wasm-extensions-real || npm run build:wasm-extensions-fake",
-        "build:wasm-extensions-real": "echo \"Building module with WebAssembly extensions\" && cross-env OUT_NAME=ruffle_web-wasm_extensions CARGO_PROFILE=web-wasm-extensions RUSTFLAGS=\"--cfg=web_sys_unstable_apis -Aunknown_lints -C target-feature=+bulk-memory,+simd128,+nontrapping-fptoint,+sign-ext,+reference-types\" WASM_BINDGEN_FLAGS=\"--reference-types\" WASM_OPT_FLAGS=\"--enable-reference-types\" npm run build:wasm",
+        "build:wasm-extensions-real": "echo \"Building module with WebAssembly extensions\" && cross-env OUT_NAME=ruffle_web-wasm_extensions CARGO_PROFILE=web-wasm-extensions RUSTFLAGS=\"$RUSTFLAGS --cfg=web_sys_unstable_apis -Aunknown_lints -C target-feature=+bulk-memory,+simd128,+nontrapping-fptoint,+sign-ext,+reference-types\" WASM_BINDGEN_FLAGS=\"--reference-types\" WASM_OPT_FLAGS=\"--enable-reference-types\" npm run build:wasm",
         "build:wasm-extensions-fake": "echo \"Copying the vanilla module as stand-in\" && shx cp dist/ruffle_web_bg.wasm dist/ruffle_web-wasm_extensions_bg.wasm && shx cp dist/ruffle_web_bg.wasm.d.ts dist/ruffle_web-wasm_extensions_bg.wasm.d.ts && shx cp dist/ruffle_web.js dist/ruffle_web-wasm_extensions.js && shx cp dist/ruffle_web.d.ts dist/ruffle_web-wasm_extensions.d.ts",
 
         "//9": "# This just chains together the three commands after it.",