Nikita Tsukanov 2 lat temu
rodzic
commit
7a2ca3e999

+ 0 - 9
samples/GpuInterop/D3DDemo/D3D11Swapchain.cs

@@ -1,23 +1,14 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
-using SharpDX.Direct2D1;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
-using SharpDX.Mathematics.Interop;
-using Buffer = SharpDX.Direct3D11.Buffer;
-using DeviceContext = SharpDX.Direct2D1.DeviceContext;
 using DxgiFactory1 = SharpDX.DXGI.Factory1;
-using Matrix = SharpDX.Matrix;
 using D3DDevice = SharpDX.Direct3D11.Device;
 using DxgiResource = SharpDX.DXGI.Resource;
-using FeatureLevel = SharpDX.Direct3D.FeatureLevel;
 
 namespace GpuInterop.D3DDemo;
 

+ 1 - 0
samples/GpuInterop/GpuInterop.csproj

@@ -28,6 +28,7 @@
     <PackageReference Include="Silk.NET.Vulkan" Version="2.16.0" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" />
+    <PackageReference Include="System.Reactive" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
samples/GpuInterop/Program.cs

@@ -1,5 +1,5 @@
-using Avalonia;
-
+global using System.Reactive.Disposables;
+using Avalonia;
 namespace GpuInterop
 {
     public class Program

+ 1 - 2
src/Avalonia.Base/Rendering/SwapchainBase.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
 using System.Threading.Tasks;
-using Avalonia;
+using Avalonia.Reactive;
 using Avalonia.Rendering.Composition;
 
 namespace Avalonia.Rendering;

+ 1 - 2
src/Avalonia.OpenGL/Controls/OpenGlControlResources.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Avalonia.Logging;
 using Avalonia.Platform;
+using Avalonia.Reactive;
 using Avalonia.Rendering.Composition;
 using static Avalonia.OpenGL.GlConsts;
 namespace Avalonia.OpenGL.Controls;