Rename Graphics to DeviceContext and make field

Author: JimBobSquarePants

src/ImageSharp.Drawing.WebGPU/WebGPURenderTarget.cs

@@ -15,7 +15,8 @@ namespace SixLabors.ImageSharp.Drawing.Processing.Backends;
 /// </remarks>
 public sealed class WebGPURenderTarget : IDisposable
 {
-    private readonly bool ownsGraphics;
+    private readonly WebGPUDeviceContext deviceContext;
+    private readonly bool ownsDeviceContext;
     private bool isDisposed;
 
     /// <summary>
@@ -65,29 +66,29 @@ public WebGPURenderTarget(
         WebGPUTextureFormat format,
         int width,
         int height)
-        : this(new WebGPUDeviceContext(configuration), ownsGraphics: true, format, width, height)
+        : this(new WebGPUDeviceContext(configuration), true, format, width, height)
     {
     }
 
     private WebGPURenderTarget(
-        WebGPUDeviceContext graphics,
-        bool ownsGraphics,
+        WebGPUDeviceContext deviceContext,
+        bool ownsDeviceContext,
         WebGPUTextureFormat format,
         int width,
         int height)
     {
-        this.Graphics = graphics;
-        this.ownsGraphics = ownsGraphics;
+        this.deviceContext = deviceContext;
+        this.ownsDeviceContext = ownsDeviceContext;
 
         try
         {
-            graphics.ThrowIfDisposed();
+            deviceContext.ThrowIfDisposed();
 
             WebGPU api = WebGPURuntime.GetApi();
             NativeSurface surface = WebGPURenderTargetAllocation.CreateRenderTarget(
                 api,
-                graphics.DeviceHandle,
-                graphics.QueueHandle,
+                deviceContext.DeviceHandle,
+                deviceContext.QueueHandle,
                 format,
                 width,
                 height,
@@ -102,9 +103,9 @@ private WebGPURenderTarget(
         }
         catch
         {
-            if (ownsGraphics)
+            if (ownsDeviceContext)
             {
-                graphics.Dispose();
+                deviceContext.Dispose();
             }
 
             throw;
@@ -114,12 +115,7 @@ private WebGPURenderTarget(
     /// <summary>
     /// Gets the WebGPU drawing backend used by this target.
     /// </summary>
-    internal WebGPUDrawingBackend Backend => this.Graphics.Backend;
-
-    /// <summary>
-    /// Gets the graphics device context used by this target.
-    /// </summary>
-    private WebGPUDeviceContext Graphics { get; }
+    internal WebGPUDrawingBackend Backend => this.deviceContext.Backend;
 
     /// <summary>
     /// Gets the native surface backing this render target.
@@ -172,12 +168,12 @@ public DrawingCanvas CreateCanvas()
     public DrawingCanvas CreateCanvas(DrawingOptions options)
     {
         this.ThrowIfDisposed();
-        this.Graphics.ThrowIfDisposed();
+        this.deviceContext.ThrowIfDisposed();
 
         return WebGPUCanvasFactory.CreateCanvas(
-            this.Graphics.Configuration,
+            this.deviceContext.Configuration,
             options,
-            this.Graphics.Backend,
+            this.deviceContext.Backend,
             this.Bounds,
             this.Surface,
             this.Format);
@@ -192,7 +188,7 @@ public Image<TPixel> Readback<TPixel>()
         where TPixel : unmanaged, IPixel<TPixel>
     {
         this.ThrowIfDisposed();
-        this.Graphics.ThrowIfDisposed();
+        this.deviceContext.ThrowIfDisposed();
 
         Image<TPixel> image = new(this.Width, this.Height);
         try
@@ -217,7 +213,7 @@ public void ReadbackInto<TPixel>(Image<TPixel> destination)
     {
         Guard.NotNull(destination, nameof(destination));
         this.ThrowIfDisposed();
-        this.Graphics.ThrowIfDisposed();
+        this.deviceContext.ThrowIfDisposed();
 
         if (destination.Width != this.Width || destination.Height != this.Height)
         {
@@ -230,8 +226,8 @@ public void ReadbackInto<TPixel>(Image<TPixel> destination)
 
         // ReadRegion owns the pixel-format check because it is the point where
         // typed CPU pixels are copied from the native WebGPU texture.
-        this.Graphics.Backend.ReadRegion(
-            this.Graphics.Configuration,
+        this.deviceContext.Backend.ReadRegion(
+            this.deviceContext.Configuration,
             frame,
             new Rectangle(0, 0, this.Width, this.Height),
             new Buffer2DRegion<TPixel>(destination.Frames.RootFrame.PixelBuffer));
@@ -250,9 +246,9 @@ public void Dispose()
         this.TextureViewHandle.Dispose();
         this.TextureHandle.Dispose();
 
-        if (this.ownsGraphics)
+        if (this.ownsDeviceContext)
         {
-            this.Graphics.Dispose();
+            this.deviceContext.Dispose();
         }
 
         this.isDisposed = true;
@@ -262,11 +258,11 @@ public void Dispose()
     /// Allocates an owned render target for the specified context, format, and size.
     /// </summary>
     internal static WebGPURenderTarget CreateFromContext(
-        WebGPUDeviceContext graphics,
+        WebGPUDeviceContext deviceContext,
         WebGPUTextureFormat format,
         int width,
         int height)
-        => new(graphics, ownsGraphics: false, format, width, height);
+        => new(deviceContext, false, format, width, height);
 
     private void ThrowIfDisposed()
         => ObjectDisposedException.ThrowIf(this.isDisposed, this);

src/ImageSharp.Drawing.WebGPU/WebGPURuntime.DeviceSharedState.cs

@@ -61,7 +61,7 @@ internal sealed class DeviceSharedState : IDisposable
         private readonly ConcurrentDictionary<string, CompositeComputePipelineInfrastructure> compositeComputePipelines = new(StringComparer.Ordinal);
         private readonly HashSet<FeatureName> deviceFeatures;
         private WebGPUHandle.HandleReference deviceReference;
-        private PfnErrorCallback uncapturedErrorCallback;
+        private readonly PfnErrorCallback uncapturedErrorCallback;
         private bool disposed;
 
         internal DeviceSharedState(WebGPU api, WebGPUDeviceHandle deviceHandle)

src/ImageSharp.Drawing.WebGPU/WebGPUSurfaceResources.cs

@@ -9,7 +9,7 @@
 namespace SixLabors.ImageSharp.Drawing.Processing.Backends;
 
 /// <summary>
-/// Owning container for the per-surface WebGPU stack: instance, surface, adapter, device, queue, drawing context,
+/// Owning container for the per-surface WebGPU stack: instance, surface, adapter, device, queue, device context,
 /// and the negotiated swapchain texture format.
 /// </summary>
 /// <remarks>
@@ -38,19 +38,20 @@ internal sealed unsafe class WebGPUSurfaceResources : IDisposable
     private bool frameInFlight;
     private readonly FeatureName requiredFeature;
     private readonly Configuration configuration;
+    private WebGPUDeviceContext deviceContext;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="WebGPUSurfaceResources"/> class with already-acquired handles.
     /// Only invoked by <see cref="Create"/> after every handle has been successfully bootstrapped.
     /// </summary>
     /// <param name="api">The shared WebGPU API loader.</param>
-    /// <param name="configuration">The ImageSharp configuration the drawing context uses for its rendering backend.</param>
+    /// <param name="configuration">The ImageSharp configuration the device context uses for its rendering backend.</param>
     /// <param name="instanceHandle">The owned WebGPU instance handle.</param>
     /// <param name="surfaceHandle">The owned WebGPU surface handle attached to the native host.</param>
     /// <param name="adapterHandle">The owned adapter handle selected for <paramref name="surfaceHandle"/>.</param>
     /// <param name="deviceHandle">The owned device handle requested from <paramref name="adapterHandle"/>.</param>
     /// <param name="queueHandle">The owned default queue handle paired with <paramref name="deviceHandle"/>.</param>
-    /// <param name="graphics">The drawing context bound to <paramref name="deviceHandle"/> and <paramref name="queueHandle"/>.</param>
+    /// <param name="deviceContext">The device context bound to <paramref name="deviceHandle"/> and <paramref name="queueHandle"/>.</param>
     /// <param name="format">The negotiated swapchain texture format.</param>
     /// <param name="requiredFeature">The optional WebGPU feature required by the selected texture format.</param>
     private WebGPUSurfaceResources(
@@ -61,7 +62,7 @@ private WebGPUSurfaceResources(
         WebGPUAdapterHandle adapterHandle,
         WebGPUDeviceHandle deviceHandle,
         WebGPUQueueHandle queueHandle,
-        WebGPUDeviceContext graphics,
+        WebGPUDeviceContext deviceContext,
         WebGPUTextureFormat format,
         FeatureName requiredFeature)
     {
@@ -72,7 +73,7 @@ private WebGPUSurfaceResources(
         this.AdapterHandle = adapterHandle;
         this.DeviceHandle = deviceHandle;
         this.QueueHandle = queueHandle;
-        this.Graphics = graphics;
+        this.deviceContext = deviceContext;
         this.Format = format;
         this.requiredFeature = requiredFeature;
     }
@@ -108,12 +109,6 @@ private WebGPUSurfaceResources(
     /// </summary>
     public WebGPUQueueHandle QueueHandle { get; private set; }
 
-    /// <summary>
-    /// Gets the drawing context bound to <see cref="DeviceHandle"/>/<see cref="QueueHandle"/>, used to wrap acquired
-    /// per-frame textures into <see cref="DrawingCanvas"/> instances.
-    /// </summary>
-    internal WebGPUDeviceContext Graphics { get; private set; }
-
     /// <summary>
     /// Gets the swapchain texture format chosen at construction time.
     /// Stable for the lifetime of this instance.
@@ -124,7 +119,7 @@ private WebGPUSurfaceResources(
     /// Bootstraps the full per-surface WebGPU stack bound to <paramref name="nativeSource"/> and leaves the surface
     /// configured against <paramref name="initialPresentMode"/> and <paramref name="initialFramebufferSize"/>.
     /// </summary>
-    /// <param name="configuration">The ImageSharp configuration the drawing context will use for its rendering backend.</param>
+    /// <param name="configuration">The ImageSharp configuration the device context will use for its rendering backend.</param>
     /// <param name="nativeSource">The native surface source that provides the platform handles for surface creation.</param>
     /// <param name="format">The swapchain texture format.</param>
     /// <param name="initialPresentMode">The present mode to apply to the first surface configuration.</param>
@@ -180,7 +175,7 @@ public static WebGPUSurfaceResources Create(
                 deviceResources.AdapterHandle,
                 deviceResources.DeviceHandle,
                 deviceResources.QueueHandle,
-                deviceResources.Graphics,
+                deviceResources.DeviceContext,
                 format,
                 requiredFeature);
 
@@ -339,7 +334,7 @@ public bool TryAcquireFrame(
         {
             textureHandle = new WebGPUTextureHandle(this.Api, (nint)surfaceTexture.Texture, ownsHandle: true);
             textureViewHandle = new WebGPUTextureViewHandle(this.Api, (nint)textureView, ownsHandle: true);
-            DrawingCanvas canvas = this.Graphics.CreateCanvas(
+            DrawingCanvas canvas = this.deviceContext.CreateCanvas(
                 options,
                 textureHandle,
                 textureViewHandle,
@@ -378,7 +373,7 @@ public bool TryAcquireFrame(
     }
 
     /// <summary>
-    /// Releases every owned handle in reverse acquisition order (graphics context, queue, device, adapter, surface, instance).
+    /// Releases every owned handle in reverse acquisition order (device context, queue, device, adapter, surface, instance).
     /// Idempotent; subsequent calls are no-ops.
     /// </summary>
     public void Dispose()
@@ -388,7 +383,7 @@ public void Dispose()
             return;
         }
 
-        this.Graphics.Dispose();
+        this.deviceContext.Dispose();
         this.QueueHandle.Dispose();
         this.DeviceHandle.Dispose();
         this.AdapterHandle.Dispose();
@@ -398,10 +393,10 @@ public void Dispose()
     }
 
     /// <summary>
-    /// Requests the adapter, device, queue, and drawing context for an existing surface.
+    /// Requests the adapter, device, queue, and device context for an existing surface.
     /// </summary>
     /// <param name="api">The shared WebGPU API loader.</param>
-    /// <param name="configuration">The ImageSharp configuration the drawing context will use.</param>
+    /// <param name="configuration">The ImageSharp configuration the device context will use.</param>
     /// <param name="instance">The instance that owns the surface.</param>
     /// <param name="surface">The surface the adapter must be compatible with.</param>
     /// <param name="requiredFeature">The optional WebGPU feature required by the selected texture format.</param>
@@ -417,7 +412,7 @@ private static DeviceResources CreateDeviceResources(
         WebGPUAdapterHandle? adapterHandle = null;
         WebGPUDeviceHandle? deviceHandle = null;
         WebGPUQueueHandle? queueHandle = null;
-        WebGPUDeviceContext? graphics = null;
+        WebGPUDeviceContext? deviceContext = null;
 
         try
         {
@@ -433,18 +428,18 @@ private static DeviceResources CreateDeviceResources(
             }
 
             queueHandle = new WebGPUQueueHandle(api, (nint)queue, ownsHandle: true);
-            graphics = new WebGPUDeviceContext(configuration, deviceHandle, queueHandle);
+            deviceContext = new WebGPUDeviceContext(configuration, deviceHandle, queueHandle);
 
-            DeviceResources resources = new(adapterHandle, deviceHandle, queueHandle, graphics);
+            DeviceResources resources = new(adapterHandle, deviceHandle, queueHandle, deviceContext);
             adapterHandle = null;
             deviceHandle = null;
             queueHandle = null;
-            graphics = null;
+            deviceContext = null;
             return resources;
         }
         catch
         {
-            graphics?.Dispose();
+            deviceContext?.Dispose();
             queueHandle?.Dispose();
             deviceHandle?.Dispose();
             adapterHandle?.Dispose();
@@ -460,7 +455,7 @@ private static DeviceResources CreateDeviceResources(
 
     /// <summary>
     /// Recovers the device-owned portion of the surface stack after device loss.
-    /// The existing instance and surface remain valid; only adapter, device, queue, and drawing context are replaced.
+    /// The existing instance and surface remain valid; only adapter, device, queue, and device context are replaced.
     /// </summary>
     /// <param name="presentMode">The present mode applied to the recovered swapchain.</param>
     /// <param name="framebufferSize">The framebuffer size in pixels.</param>
@@ -481,18 +476,18 @@ private void RecoverDeviceResources(WebGPUPresentMode presentMode, Size framebuf
 
             this.ConfigureSurfaceCore(presentMode, framebufferSize, deviceResources.DeviceHandle);
 
-            WebGPUDeviceContext oldGraphics = this.Graphics;
+            WebGPUDeviceContext oldDeviceContext = this.deviceContext;
             WebGPUQueueHandle oldQueueHandle = this.QueueHandle;
             WebGPUDeviceHandle oldDeviceHandle = this.DeviceHandle;
             WebGPUAdapterHandle oldAdapterHandle = this.AdapterHandle;
 
-            this.Graphics = deviceResources.Graphics;
+            this.deviceContext = deviceResources.DeviceContext;
             this.QueueHandle = deviceResources.QueueHandle;
             this.DeviceHandle = deviceResources.DeviceHandle;
             this.AdapterHandle = deviceResources.AdapterHandle;
             deviceResources = null;
 
-            oldGraphics.Dispose();
+            oldDeviceContext.Dispose();
             oldQueueHandle.Dispose();
             oldDeviceHandle.Dispose();
             oldAdapterHandle.Dispose();
@@ -617,12 +612,12 @@ public DeviceResources(
             WebGPUAdapterHandle adapterHandle,
             WebGPUDeviceHandle deviceHandle,
             WebGPUQueueHandle queueHandle,
-            WebGPUDeviceContext graphics)
+            WebGPUDeviceContext deviceContext)
         {
             this.AdapterHandle = adapterHandle;
             this.DeviceHandle = deviceHandle;
             this.QueueHandle = queueHandle;
-            this.Graphics = graphics;
+            this.DeviceContext = deviceContext;
         }
 
         public WebGPUAdapterHandle AdapterHandle { get; }
@@ -631,11 +626,11 @@ public DeviceResources(
 
         public WebGPUQueueHandle QueueHandle { get; }
 
-        internal WebGPUDeviceContext Graphics { get; }
+        internal WebGPUDeviceContext DeviceContext { get; }
 
         public void Dispose()
         {
-            this.Graphics.Dispose();
+            this.DeviceContext.Dispose();
             this.QueueHandle.Dispose();
             this.DeviceHandle.Dispose();
             this.AdapterHandle.Dispose();