render: Removed now-unused BitmapSource from RenderBackend shape methods

core/src/display_object/graphic.rs

@@ -54,7 +54,7 @@ impl<'gc> Graphic<'gc> {
         let static_data = GraphicStatic {
             id: swf_shape.id,
             bounds: swf_shape.shape_bounds.clone(),
-            render_handle: Some(context.renderer.register_shape(shape, &bitmap_source)),
+            render_handle: Some(context.renderer.register_shape(shape)),
             shape: swf_shape,
             movie,
         };

core/src/display_object/morph_shape.rs

@@ -204,7 +204,7 @@ impl MorphShapeStatic {
                 gc_context: context.gc_context,
             };
             let shape = DistilledShape::from_shape(&frame.shape, &bitmap_source, context.renderer);
-            let handle = context.renderer.register_shape(shape, &bitmap_source);
+            let handle = context.renderer.register_shape(shape);
             frame.shape_handle = Some(handle);
             handle
         }

core/src/drawing.rs

@@ -239,10 +239,10 @@ impl Drawing {
                 id: 0,
             };
             if let Some(handle) = self.render_handle.get() {
-                context.renderer.replace_shape(shape, self, handle);
+                context.renderer.replace_shape(shape, handle);
             } else {
                 self.render_handle
-                    .set(Some(context.renderer.register_shape(shape, self)));
+                    .set(Some(context.renderer.register_shape(shape)));
             }
         }
 

render/canvas/src/lib.rs

@@ -5,9 +5,7 @@ use ruffle_render::backend::null::NullBitmapSource;
 use ruffle_render::backend::{
     Context3D, Context3DCommand, RenderBackend, ShapeHandle, ViewportDimensions,
 };
-use ruffle_render::bitmap::{
-    Bitmap, BitmapFormat, BitmapHandle, BitmapHandleImpl, BitmapSource, SyncHandle,
-};
+use ruffle_render::bitmap::{Bitmap, BitmapFormat, BitmapHandle, BitmapHandleImpl, SyncHandle};
 use ruffle_render::color_transform::ColorTransform;
 use ruffle_render::commands::{CommandHandler, CommandList};
 use ruffle_render::error::Error;
@@ -436,23 +434,14 @@ impl RenderBackend for WebCanvasRenderBackend {
         }
     }
 
-    fn register_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-    ) -> ShapeHandle {
+    fn register_shape(&mut self, shape: DistilledShape) -> ShapeHandle {
         let handle = ShapeHandle(self.shapes.len());
         let data = swf_shape_to_canvas_commands(shape, self);
         self.shapes.push(data);
         handle
     }
 
-    fn replace_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-        handle: ShapeHandle,
-    ) {
+    fn replace_shape(&mut self, shape: DistilledShape, handle: ShapeHandle) {
         let data = swf_shape_to_canvas_commands(shape, self);
         self.shapes[handle.0] = data;
     }
@@ -462,16 +451,13 @@ impl RenderBackend for WebCanvasRenderBackend {
         let (fills, strokes) =
             ShapeConverter::from_shape(&shape, &NullBitmapSource, self).into_commands();
 
-        self.register_shape(
-            DistilledShape {
-                fills,
-                strokes,
-                shape_bounds: shape.shape_bounds.clone(),
-                edge_bounds: shape.edge_bounds.clone(),
-                id: shape.id,
-            },
-            &NullBitmapSource,
-        )
+        self.register_shape(DistilledShape {
+            fills,
+            strokes,
+            shape_bounds: shape.shape_bounds.clone(),
+            edge_bounds: shape.edge_bounds.clone(),
+            id: shape.id,
+        })
     }
 
     fn render_offscreen(

render/src/backend.rs

@@ -1,6 +1,6 @@
 pub mod null;
 
-use crate::bitmap::{Bitmap, BitmapHandle, BitmapSource, SyncHandle};
+use crate::bitmap::{Bitmap, BitmapHandle, SyncHandle};
 use crate::commands::CommandList;
 use crate::error::Error;
 use crate::filters::Filter;
@@ -19,17 +19,8 @@ pub trait RenderBackend: Downcast {
     // Do not call this method directly - use `player.set_viewport_dimensions`,
     // which will ensure that the stage is properly updated as well.
     fn set_viewport_dimensions(&mut self, dimensions: ViewportDimensions);
-    fn register_shape(
-        &mut self,
-        shape: DistilledShape,
-        bitmap_source: &dyn BitmapSource,
-    ) -> ShapeHandle;
-    fn replace_shape(
-        &mut self,
-        shape: DistilledShape,
-        bitmap_source: &dyn BitmapSource,
-        handle: ShapeHandle,
-    );
+    fn register_shape(&mut self, shape: DistilledShape) -> ShapeHandle;
+    fn replace_shape(&mut self, shape: DistilledShape, handle: ShapeHandle);
     fn register_glyph_shape(&mut self, shape: &swf::Glyph) -> ShapeHandle;
 
     /// Creates a new `RenderBackend` which renders directly

render/src/backend/null.rs

@@ -43,20 +43,10 @@ impl RenderBackend for NullRenderer {
     fn set_viewport_dimensions(&mut self, dimensions: ViewportDimensions) {
         self.dimensions = dimensions;
     }
-    fn register_shape(
-        &mut self,
-        _shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-    ) -> ShapeHandle {
+    fn register_shape(&mut self, _shape: DistilledShape) -> ShapeHandle {
         ShapeHandle(0)
     }
-    fn replace_shape(
-        &mut self,
-        _shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-        _handle: ShapeHandle,
-    ) {
-    }
+    fn replace_shape(&mut self, _shape: DistilledShape, _handle: ShapeHandle) {}
     fn register_glyph_shape(&mut self, _shape: &swf::Glyph) -> ShapeHandle {
         ShapeHandle(0)
     }

render/webgl/src/lib.rs

@@ -10,9 +10,7 @@ use ruffle_render::backend::null::NullBitmapSource;
 use ruffle_render::backend::{
     Context3D, Context3DCommand, RenderBackend, ShapeHandle, ViewportDimensions,
 };
-use ruffle_render::bitmap::{
-    Bitmap, BitmapFormat, BitmapHandle, BitmapHandleImpl, BitmapSource, SyncHandle,
-};
+use ruffle_render::bitmap::{Bitmap, BitmapFormat, BitmapHandle, BitmapHandleImpl, SyncHandle};
 use ruffle_render::commands::{CommandHandler, CommandList};
 use ruffle_render::error::Error as BitmapError;
 use ruffle_render::quality::StageQuality;
@@ -981,11 +979,7 @@ impl RenderBackend for WebGlRenderBackend {
         self.viewport_scale_factor = dimensions.scale_factor
     }
 
-    fn register_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-    ) -> ShapeHandle {
+    fn register_shape(&mut self, shape: DistilledShape) -> ShapeHandle {
         let handle = ShapeHandle(self.meshes.len());
         match self.register_shape_internal(shape) {
             Ok(mesh) => self.meshes.push(mesh),
@@ -994,12 +988,7 @@ impl RenderBackend for WebGlRenderBackend {
         handle
     }
 
-    fn replace_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-        handle: ShapeHandle,
-    ) {
+    fn replace_shape(&mut self, shape: DistilledShape, handle: ShapeHandle) {
         self.delete_mesh(&self.meshes[handle.0]);
         match self.register_shape_internal(shape) {
             Ok(mesh) => self.meshes[handle.0] = mesh,

render/wgpu/src/backend.rs

@@ -13,7 +13,7 @@ use gc_arena::MutationContext;
 use ruffle_render::backend::null::NullBitmapSource;
 use ruffle_render::backend::{Context3D, Context3DCommand};
 use ruffle_render::backend::{RenderBackend, ShapeHandle, ViewportDimensions};
-use ruffle_render::bitmap::{Bitmap, BitmapHandle, BitmapSource, SyncHandle};
+use ruffle_render::bitmap::{Bitmap, BitmapHandle, SyncHandle};
 use ruffle_render::commands::CommandList;
 use ruffle_render::error::Error as BitmapError;
 use ruffle_render::filters::Filter;
@@ -373,24 +373,15 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
     }
 
     #[instrument(level = "debug", skip_all)]
-    fn register_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-    ) -> ShapeHandle {
+    fn register_shape(&mut self, shape: DistilledShape) -> ShapeHandle {
         let handle = ShapeHandle(self.meshes.len());
         let meshes = self.register_shape_internal(shape);
         self.meshes.push(meshes);
         handle
     }
 
     #[instrument(level = "debug", skip_all)]
-    fn replace_shape(
-        &mut self,
-        shape: DistilledShape,
-        _bitmap_source: &dyn BitmapSource,
-        handle: ShapeHandle,
-    ) {
+    fn replace_shape(&mut self, shape: DistilledShape, handle: ShapeHandle) {
         let mesh = self.register_shape_internal(shape);
         self.meshes[handle.0] = mesh;
     }