Merge pull request #54 from smoogipoo/fix-d3d-texture-disposal

Work around D3D11 texture pointer getting lost before disposal
ppy · May 3, 2024 · 0c0f356 · 0c0f356
2 parents f258ed0 + 8c2aedf
commit 0c0f356
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Veldrid/D3D11/D3D11Texture.cs b/src/Veldrid/D3D11/D3D11Texture.cs
@@ -145,6 +145,9 @@ public D3D11Texture(ID3D11Device device, ref TextureDescription description)
 
                 DeviceTexture = device.CreateTexture3D(desc3D);
             }
+
+            // See: https://github.com/ppy/veldrid/issues/53
+            GC.SuppressFinalize(DeviceTexture);
         }
 
         public D3D11Texture(ID3D11Texture2D existingTexture, TextureType type, PixelFormat format)
@@ -167,6 +170,9 @@ public D3D11Texture(ID3D11Texture2D existingTexture, TextureType type, PixelForm
                 format,
                 (Usage & TextureUsage.DepthStencil) == TextureUsage.DepthStencil);
             TypelessDxgiFormat = D3D11Formats.GetTypelessFormat(DxgiFormat);
+
+            // See: https://github.com/ppy/veldrid/issues/53
+            GC.SuppressFinalize(DeviceTexture);
         }
 
         private protected override TextureView CreateFullTextureView(GraphicsDevice gd)

diff --git a/src/Veldrid/D3D11/D3D11TextureView.cs b/src/Veldrid/D3D11/D3D11TextureView.cs
@@ -37,8 +37,12 @@ public D3D11TextureView(D3D11GraphicsDevice gd, ref TextureViewDescription descr
                 description.BaseArrayLayer,
                 description.ArrayLayers,
                 Format);
+
             ShaderResourceView = device.CreateShaderResourceView(d3dTex.DeviceTexture, srvDesc);
 
+            // See: https://github.com/ppy/veldrid/issues/53
+            GC.SuppressFinalize(ShaderResourceView);
+
             if ((d3dTex.Usage & TextureUsage.Storage) == TextureUsage.Storage)
             {
                 var uavDesc = new UnorderedAccessViewDescription
@@ -93,6 +97,9 @@ public D3D11TextureView(D3D11GraphicsDevice gd, ref TextureViewDescription descr
                 }
 
                 UnorderedAccessView = device.CreateUnorderedAccessView(d3dTex.DeviceTexture, uavDesc);
+
+                // See: https://github.com/ppy/veldrid/issues/53
+                GC.SuppressFinalize(UnorderedAccessView);
             }
         }