Renderer: Updates Vortice

SuRGeoNix · Nov 18, 2021 · 57aa942 · 57aa942
1 parent c9a936d
commit 57aa942
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/FlyleafLib/FlyleafLib.csproj b/FlyleafLib/FlyleafLib.csproj
@@ -47,8 +47,8 @@
     <PackageReference Include="FFmpeg.AutoGen" Version="4.4.1" />
     <PackageReference Include="NAudio.Core" Version="2.0.0" />
     <PackageReference Include="NAudio.Wasapi" Version="2.0.0" />
-    <PackageReference Include="Vortice.D3DCompiler" Version="2.0.20-beta" />
-    <PackageReference Include="Vortice.Direct3D11" Version="2.0.20-beta" />
+    <PackageReference Include="Vortice.D3DCompiler" Version="2.1.0-beta4" />
+    <PackageReference Include="Vortice.Direct3D11" Version="2.1.0-beta4" />
     <PackageReference Include="Vortice.Mathematics" Version="1.3.21" />
   </ItemGroup>
 

diff --git a/FlyleafLib/MediaFramework/MediaRenderer/Renderer.cs b/FlyleafLib/MediaFramework/MediaRenderer/Renderer.cs
@@ -224,7 +224,7 @@ public Renderer(VideoDecoder videoDecoder, Config config, Control control = null
             {
                 for (int adapterIndex = 0; factory.EnumAdapters1(adapterIndex, out adapter).Success; adapterIndex++)
                 {
-                    if (adapter.Description1.Luid == Config.Video.GPUAdapteLuid)
+                    if (adapter.Description1.AdapterLuid == Config.Video.GPUAdapteLuid)
                        break;
 
                     adapter.Dispose();
@@ -277,7 +277,7 @@ public Renderer(VideoDecoder videoDecoder, Config config, Control control = null
                     Width       = Control.Width,
                     Height      = Control.Height,
                     AlphaMode   = AlphaMode.Ignore,
-                    Usage       = Usage.RenderTargetOutput,
+                    BufferUsage = Usage.RenderTargetOutput,
 
                     SampleDescription = new SampleDescription(1, 0)
                 };
@@ -389,7 +389,7 @@ public static Dictionary<long, GPUAdapter> GetAdapters()
             for (int adapterIndex = 0; factory.EnumAdapters1(adapterIndex, out IDXGIAdapter1 adapter).Success; adapterIndex++)
             {
                 #if DEBUG
-                Utils.Log($"[#{adapterIndex+1}] {adapter.Description1.Description} (Id: {adapter.Description1.DeviceId} | Luid: {adapter.Description1.Luid}) | DVM: {adapter.Description1.DedicatedVideoMemory}");
+                Utils.Log($"[#{adapterIndex+1}] {adapter.Description1.Description} (Id: {adapter.Description1.DeviceId} | Luid: {adapter.Description1.AdapterLuid}) | DVM: {adapter.Description1.DedicatedVideoMemory}");
                 #endif
 
                 if ((adapter.Description1.Flags & AdapterFlags.Software) != AdapterFlags.None)
@@ -408,7 +408,7 @@ public static Dictionary<long, GPUAdapter> GetAdapters()
                     output.Dispose();
                 }
 
-                adapters[adapter.Description1.Luid] = new GPUAdapter() { Description = adapter.Description1.Description, Luid = adapter.Description1.Luid, HasOutput = hasOutput };
+                adapters[adapter.Description1.AdapterLuid] = new GPUAdapter() { Description = adapter.Description1.Description, Luid = adapter.Description1.AdapterLuid, HasOutput = hasOutput };
 
                 adapter.Dispose();
                 adapter = null;

diff --git a/FlyleafLib/MediaFramework/MediaRenderer/RendererInfo.cs b/FlyleafLib/MediaFramework/MediaRenderer/RendererInfo.cs
@@ -6,8 +6,8 @@ namespace FlyleafLib.MediaFramework.MediaRenderer
 {
     public unsafe class RendererInfo
     {
-        public long     Luid            { get; set; }
         public string   AdapterDesc     { get; set; }
+        public long     AdapterLuid     { get; set; }
         public UInt64   SystemMemory    { get; set; }
         public UInt64   VideoMemory     { get; set; }
         public UInt64   SharedMemory    { get; set; }
@@ -21,11 +21,11 @@ public static void Fill(Renderer renderer, IDXGIAdapter1 adapter)
         {
             RendererInfo ri = new RendererInfo();
 
+            ri.AdapterLuid  = adapter.Description1.AdapterLuid;
             ri.AdapterDesc  = adapter.Description.Description;
-            ri.SystemMemory = (UInt64)((IntPtr)adapter.Description.DedicatedSystemMemory).ToPointer();
-            ri.VideoMemory  = (UInt64)((IntPtr)adapter.Description.DedicatedVideoMemory).ToPointer();
-            ri.SharedMemory = (UInt64)((IntPtr)adapter.Description.SharedSystemMemory).ToPointer();
-            ri.Luid         = adapter.Description1.Luid;
+            ri.SystemMemory = adapter.Description.DedicatedSystemMemory;
+            ri.VideoMemory  = adapter.Description.DedicatedVideoMemory;
+            ri.SharedMemory = adapter.Description.SharedSystemMemory;
 
             int maxVerticalResolution = 0;
             for(int i=0; ; i++)
@@ -100,7 +100,7 @@ public string GetBytesReadable(UInt64 i)
         public override string ToString()
         {
             var gcd = Utils.GCD(ScreenWidth, ScreenHeight);
-            return $"[Adapter-{Luid}] {AdapterDesc} System: {GetBytesReadable(SystemMemory)} Video: {GetBytesReadable(VideoMemory)} Shared: {GetBytesReadable(SharedMemory)}\r\n[Output ] {OutputName} (X={ScreenBounds.X}, Y={ScreenBounds.Y}) {ScreenWidth}x{ScreenHeight}" + (gcd > 0 ? $" [{ScreenWidth/gcd}:{ScreenHeight/gcd}]" : "");
+            return $"[Adapter-{AdapterLuid}] {AdapterDesc} System: {GetBytesReadable(SystemMemory)} Video: {GetBytesReadable(VideoMemory)} Shared: {GetBytesReadable(SharedMemory)}\r\n[Output ] {OutputName} (X={ScreenBounds.X}, Y={ScreenBounds.Y}) {ScreenWidth}x{ScreenHeight}" + (gcd > 0 ? $" [{ScreenWidth/gcd}:{ScreenHeight/gcd}]" : "");
         }
     }
 }