Merge pull request #5693 from peppy/use-forked-veldrid

Switch to using custom veldrid fork
ppy · Mar 22, 2023 · b1fe5da · b1fe5da
2 parents 4876af7 + cb68921
commit b1fe5da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/osu.Framework/Graphics/Veldrid/VeldridExtensions.cs b/osu.Framework/Graphics/Veldrid/VeldridExtensions.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
@@ -351,8 +352,8 @@ public static void LogD3D11(this GraphicsDevice device, out int maxTextureSize)
             Debug.Assert(device.BackendType == GraphicsBackend.Direct3D11);
 
             var info = device.GetD3D11Info();
-            var dxgiAdapter = MarshallingHelpers.FromPointer<IDXGIAdapter>(info.Adapter);
-            var d3d11Device = MarshallingHelpers.FromPointer<ID3D11Device>(info.Device);
+            var dxgiAdapter = MarshallingHelpers.FromPointer<IDXGIAdapter>(info.Adapter).AsNonNull();
+            var d3d11Device = MarshallingHelpers.FromPointer<ID3D11Device>(info.Device).AsNonNull();
 
             maxTextureSize = ID3D11Resource.MaximumTexture2DSize;
 

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
@@ -27,6 +27,8 @@
     <PackageReference Include="ppy.ManagedBass" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Fx" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
+    <PackageReference Include="ppy.Veldrid" Version="4.9.1-g0c2e8e25b7" />
+    <PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-gab8ec76d56" />
     <PackageReference Include="SharpFNT" Version="2.0.0" />
     <!-- Preview version of ImageSharp causes NU5104. -->
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.0" />
@@ -37,8 +39,6 @@
     <PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
     <PackageReference Include="StbiSharp" Version="1.1.0" />
     <PackageReference Include="ppy.SDL2-CS" Version="1.0.630-alpha" />
-    <PackageReference Include="Veldrid" Version="4.9.0-beta2" />
-    <PackageReference Include="Veldrid.SPIRV" Version="1.0.15" />
     <PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2022.1222.1" />
 
     <!-- DO NOT use ProjectReference for native packaging project.