Remove FramebufferSize from WebGPUSurfaceFrame

Author: JimBobSquarePants

samples/WebGPUExternalSurfaceDemo/Controls/WebGPURenderControl.cs

@@ -44,16 +44,10 @@ public WebGPURenderControl()
     }
 
     /// <summary>
-    /// Raised each frame once the external surface has acquired a drawable frame. The canvas dimensions match
-    /// <see cref="FramebufferSize"/>.
+    /// Raised each frame once the external surface has acquired a drawable frame.
     /// </summary>
     public event Action<DrawingCanvas<Bgra32>, TimeSpan>? PaintFrame;
 
-    /// <summary>
-    /// Gets the drawable framebuffer size in pixels.
-    /// </summary>
-    public Size FramebufferSize => this.framebufferSize;
-
     /// <inheritdoc />
     protected override void OnHandleCreated(EventArgs e)
     {

samples/WebGPUExternalSurfaceDemo/MainForm.cs

@@ -117,27 +117,14 @@ public MainForm()
     }
 
     private void OnPaintClock(DrawingCanvas<Bgra32> canvas, TimeSpan delta)
-    {
-        Size s = this.clockControl.FramebufferSize;
-
-        // Scene coordinates match the drawable framebuffer, not the form's layout bounds.
-        this.clockScene.Paint(canvas, new SixLabors.ImageSharp.Size(s.Width, s.Height), delta);
-    }
+        => this.clockScene.Paint(canvas, delta);
 
     private void OnPaintTiger(DrawingCanvas<Bgra32> canvas, TimeSpan delta)
     {
-        Size s = this.tigerControl.FramebufferSize;
-
-        // Scene coordinates match the drawable framebuffer, not the form's layout bounds.
-        this.tigerScene.Paint(canvas, new SixLabors.ImageSharp.Size(s.Width, s.Height), delta);
+        this.tigerScene.Paint(canvas, delta);
         this.tigerStatusLabel.Text = this.tigerScene.StatusText;
     }
 
     private void OnPaintApply(DrawingCanvas<Bgra32> canvas, TimeSpan delta)
-    {
-        Size s = this.applyControl.FramebufferSize;
-
-        // Scene coordinates match the drawable framebuffer, not the form's layout bounds.
-        this.applyScene.Paint(canvas, new SixLabors.ImageSharp.Size(s.Width, s.Height), delta);
-    }
+        => this.applyScene.Paint(canvas, delta);
 }

samples/WebGPUExternalSurfaceDemo/README.md

@@ -75,7 +75,7 @@ this.framebufferSize = this.ClientSize;
 this.surface.Resize(new ImageSharpSize(this.framebufferSize.Width, this.framebufferSize.Height));
 ```
 
-The sample stores that size as `FramebufferSize` so scene code can draw in the same pixel coordinate space as the acquired frame.
+The acquired frame exposes the same pixel coordinate space through `frame.Canvas.Bounds`.
 
 ### Frame Acquisition
 
@@ -114,7 +114,6 @@ The scenes are deliberately ordinary canvas code:
 Each scene receives:
 
 - `DrawingCanvas<Bgra32>` for the acquired frame
-- the current framebuffer size
 - elapsed time since the previous frame
 
 ## Files

samples/WebGPUExternalSurfaceDemo/Scenes/ApplyReadbackScene.cs

@@ -35,14 +35,11 @@ internal sealed class ApplyReadbackScene : RenderScene
 
     public override string DisplayName => "Apply";
 
-    public override void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, TimeSpan deltaTime)
+    public override void Paint(DrawingCanvas<Bgra32> canvas, TimeSpan deltaTime)
     {
-        if (viewportSize.Width <= 0 || viewportSize.Height <= 0)
-        {
-            return;
-        }
+        Size viewportSize = canvas.Bounds.Size;
 
-        canvas.Fill(Brushes.Solid(BackgroundColor), new RectangularPolygon(0, 0, viewportSize.Width, viewportSize.Height));
+        canvas.Fill(Brushes.Solid(BackgroundColor), canvas.Bounds);
         DrawPattern(canvas, viewportSize);
 
         // Keep both regions tied to the pointer so every movement exercises readback from a different part
@@ -63,7 +60,7 @@ public override void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, Time
         canvas.Apply(edgeRegion, ctx => ctx.DetectEdges());
         canvas.Apply(blurRegion, ctx => ctx.GaussianBlur(Math.Max(3F, Math.Min(viewportSize.Width, viewportSize.Height) / 120F)));
 
-        canvas.Draw(Pens.Solid(OutlineColor, 3), new RectangularPolygon(edgeRegion.X, edgeRegion.Y, edgeRegion.Width, edgeRegion.Height));
+        canvas.Draw(Pens.Solid(OutlineColor, 3), new RectangularPolygon(edgeRegion));
         canvas.Draw(Pens.Solid(OutlineColor, 3), blurRegion);
     }
 

samples/WebGPUExternalSurfaceDemo/Scenes/ClockScene.cs

@@ -52,12 +52,12 @@ public ClockScene()
 
     public override string DisplayName => "Clock";
 
-    public override void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, TimeSpan deltaTime)
+    public override void Paint(DrawingCanvas<Bgra32> canvas, TimeSpan deltaTime)
     {
+        Size viewportSize = canvas.Bounds.Size;
+
         // Background clear.
-        canvas.Fill(
-            Brushes.Solid(BackgroundColor),
-            new RectangularPolygon(0, 0, viewportSize.Width, viewportSize.Height));
+        canvas.Fill(Brushes.Solid(BackgroundColor), canvas.Bounds);
 
         // The scene is rebuilt from the framebuffer size each frame. That keeps resize handling simple
         // and demonstrates drawing directly in surface pixel coordinates.

samples/WebGPUExternalSurfaceDemo/Scenes/RenderScene.cs

@@ -22,9 +22,8 @@ internal abstract class RenderScene
     /// Draws the scene into <paramref name="canvas"/> for the current frame.
     /// </summary>
     /// <param name="canvas">The per-frame drawing canvas bound to the external surface's swap-chain texture.</param>
-    /// <param name="viewportSize">The framebuffer size in pixels.</param>
     /// <param name="deltaTime">Elapsed time since the previous frame. Scenes that render from absolute state can ignore it.</param>
-    public abstract void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, TimeSpan deltaTime);
+    public abstract void Paint(DrawingCanvas<Bgra32> canvas, TimeSpan deltaTime);
 
     /// <summary>
     /// Handles a mouse-button press. Default implementation is a no-op.

samples/WebGPUExternalSurfaceDemo/Scenes/TigerViewerScene.cs

@@ -71,8 +71,10 @@ public string StatusText
         }
     }
 
-    public override void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, TimeSpan deltaTime)
+    public override void Paint(DrawingCanvas<Bgra32> canvas, TimeSpan deltaTime)
     {
+        Size viewportSize = canvas.Bounds.Size;
+
         if (this.needsInitialFit || viewportSize != this.lastViewportSize)
         {
             // The first frame and every resize recenter the artwork. User pan/zoom then operates from
@@ -83,9 +85,7 @@ public override void Paint(DrawingCanvas<Bgra32> canvas, Size viewportSize, Time
 
         this.lastViewportSize = viewportSize;
 
-        canvas.Fill(
-            Brushes.Solid(BackgroundColor),
-            new RectangularPolygon(0, 0, viewportSize.Width, viewportSize.Height));
+        canvas.Fill(Brushes.Solid(BackgroundColor), canvas.Bounds);
 
         SizeF screenCenter = viewportSize / 2f;
 

samples/WebGPUWindowDemo/Program.cs

@@ -142,14 +142,15 @@ private void OnUpdate(TimeSpan deltaTime)
         /// <summary>
         /// Draws one frame into the acquired WebGPU window surface.
         /// </summary>
-        /// <param name="frame">The acquired frame that exposes the canvas and per-frame timing data.</param>
+        /// <param name="frame">The acquired frame that exposes the drawing canvas.</param>
         /// <remarks>
         /// The window loop disposes the frame after this callback returns, which flushes any queued canvas work,
         /// presents the swapchain texture, and releases the per-frame WebGPU handles.
         /// </remarks>
         private void OnRender(WebGPUSurfaceFrame<Bgra32> frame)
         {
             DrawingCanvas<Bgra32> canvas = frame.Canvas;
+            Rectangle bounds = canvas.Bounds;
             canvas.Fill(Brushes.Solid(Color.FromPixel(new Bgra32(30, 30, 40, 255))));
 
             for (int i = 0; i < this.balls.Length; i++)
@@ -159,7 +160,7 @@ private void OnRender(WebGPUSurfaceFrame<Bgra32> frame)
                 canvas.Fill(Brushes.Solid(ball.Color), ellipse);
             }
 
-            this.DrawScrollingText(canvas, frame.FramebufferSize.Width, frame.FramebufferSize.Height);
+            this.DrawScrollingText(canvas, bounds.Width, bounds.Height);
 
             this.frameCount++;
             TimeSpan elapsed = this.fpsWindow.Elapsed;

src/ImageSharp.Drawing.WebGPU/WebGPUSurfaceFrame{TPixel}.cs

@@ -29,15 +29,13 @@ internal WebGPUSurfaceFrame(
         WebGPUTextureHandle textureHandle,
         WebGPUTextureViewHandle textureViewHandle,
         DrawingCanvas<TPixel> canvas,
-        Size framebufferSize,
         Action? onDisposed = null)
     {
         this.api = api;
         this.surfaceReference = surfaceHandle.AcquireReference();
         this.textureHandle = textureHandle;
         this.textureViewHandle = textureViewHandle;
         this.Canvas = canvas;
-        this.FramebufferSize = framebufferSize;
         this.onDisposed = onDisposed;
     }
 
@@ -46,11 +44,6 @@ internal WebGPUSurfaceFrame(
     /// </summary>
     public DrawingCanvas<TPixel> Canvas { get; }
 
-    /// <summary>
-    /// Gets the framebuffer size at frame acquisition time.
-    /// </summary>
-    public Size FramebufferSize { get; }
-
     /// <summary>
     /// Flushes pending canvas work and presents the frame on screen.
     /// </summary>

src/ImageSharp.Drawing.WebGPU/WebGPUSurfaceResources{TPixel}.cs

@@ -266,9 +266,8 @@ private void ConfigureSurfaceCore(WebGPUPresentMode presentMode, Size framebuffe
     /// <param name="presentMode">The present mode applied when the surface needs to be reconfigured in response to a
     /// <c>Timeout</c>/<c>Outdated</c>/<c>Lost</c> acquire status.</param>
     /// <param name="framebufferSize">The current framebuffer size in pixels. A zero-area value causes the method to
-    /// return <see langword="false"/> without touching the surface. Otherwise this size is used both for the returned
-    /// frame's <see cref="WebGPUSurfaceFrame{TPixel}.FramebufferSize"/> and for any in-place surface
-    /// reconfiguration triggered by a non-success acquire status.</param>
+    /// return <see langword="false"/> without touching the surface. Otherwise this size is used for the returned
+    /// frame canvas and for any in-place surface reconfiguration triggered by a non-success acquire status.</param>
     /// <param name="options">The drawing options that seed the canvas on the returned frame.</param>
     /// <param name="frame">Receives the acquired frame on success.</param>
     /// <returns><see langword="true"/> when a frame is available; <see langword="false"/> when no drawable frame is
@@ -361,7 +360,6 @@ public bool TryAcquireFrame(
                 textureHandle,
                 textureViewHandle,
                 canvas,
-                framebufferSize,
                 onDisposed: () => this.frameInFlight = false);
 
             return true;