From eee639d6ba544fa5dd9352426d55e91bc54e157d Mon Sep 17 00:00:00 2001
From: LDj3SNuD <35856442+LDj3SNuD@users.noreply.github.com>
Date: Thu, 31 Oct 2019 19:09:03 +0100
Subject: .NET Core 3.0 is here! (#784)

* .NET Core 3.0 is here!

* Remove IMemoryManager.cs and its references.

* Add T Math/F.FusedMultiplyAdd(T, T, T). Nits.

* Nit.

* Update appveyor.yml

* Revert "Resolve Visual Studio build issues"

This reverts commit 1772128ce0fc058e6280001aace3a77a7a96897b.

* Update SvcTable.cs
---
 Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs    | 4 ++--
 Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs | 4 ++--
 Ryujinx.Graphics/Memory/NvGpuVmm.cs                  | 4 ++--
 Ryujinx.Graphics/Memory/NvGpuVmmCache.cs             | 4 ++--
 Ryujinx.Graphics/Ryujinx.Graphics.csproj             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Ryujinx.Graphics')

diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
index ab45e985..10c36fe1 100644
--- a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
+++ b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
@@ -230,7 +230,7 @@ namespace Ryujinx.Graphics.Texture
 
         public static byte[] ReadTexture(IMemory memory, GalImage image, long position)
         {
-            IMemoryManager cpuMemory;
+            MemoryManager cpuMemory;
 
             if (memory is NvGpuVmm vmm)
             {
@@ -238,7 +238,7 @@ namespace Ryujinx.Graphics.Texture
             }
             else
             {
-                cpuMemory = (IMemoryManager)memory;
+                cpuMemory = (MemoryManager)memory;
             }
 
             ISwizzle swizzle = TextureHelper.GetSwizzle(image);
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs b/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
index 22b803db..e07eb037 100644
--- a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
+++ b/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
@@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Texture
             }
         }
 
-        public static (IMemoryManager Memory, long Position) GetMemoryAndPosition(
+        public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
             IMemory memory,
             long    position)
         {
@@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.Texture
                 return (vmm.Memory, vmm.GetPhysicalAddress(position));
             }
 
-            return ((IMemoryManager)memory, position);
+            return ((MemoryManager)memory, position);
         }
     }
 }
diff --git a/Ryujinx.Graphics/Memory/NvGpuVmm.cs b/Ryujinx.Graphics/Memory/NvGpuVmm.cs
index d8ccd6c7..c72b82e3 100644
--- a/Ryujinx.Graphics/Memory/NvGpuVmm.cs
+++ b/Ryujinx.Graphics/Memory/NvGpuVmm.cs
@@ -23,7 +23,7 @@ namespace Ryujinx.Graphics.Memory
         private const int PtLvl0Bit = PtPageBits + PtLvl1Bits;
         private const int PtLvl1Bit = PtPageBits;
 
-        public IMemoryManager Memory { get; private set; }
+        public MemoryManager Memory { get; private set; }
 
         private NvGpuVmmCache _cache;
 
@@ -32,7 +32,7 @@ namespace Ryujinx.Graphics.Memory
 
         private long[][] _pageTable;
 
-        public NvGpuVmm(IMemoryManager memory)
+        public NvGpuVmm(MemoryManager memory)
         {
             Memory = memory;
 
diff --git a/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs b/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs
index 37ead4e0..2a505443 100644
--- a/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs
+++ b/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs
@@ -12,9 +12,9 @@ namespace Ryujinx.Graphics.Memory
 
         private ConcurrentDictionary<long, int>[] _cachedPages;
 
-        private IMemoryManager _memory;
+        private MemoryManager _memory;
 
-        public NvGpuVmmCache(IMemoryManager memory)
+        public NvGpuVmmCache(MemoryManager memory)
         {
             _memory = memory;
 
diff --git a/Ryujinx.Graphics/Ryujinx.Graphics.csproj b/Ryujinx.Graphics/Ryujinx.Graphics.csproj
index e2bf1693..4467fcdd 100644
--- a/Ryujinx.Graphics/Ryujinx.Graphics.csproj
+++ b/Ryujinx.Graphics/Ryujinx.Graphics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <Configurations>Debug;Release;Profile Debug;Profile Release</Configurations>
   </PropertyGroup>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FFmpeg.AutoGen" Version="4.0.0.4" />
+    <PackageReference Include="FFmpeg.AutoGen" Version="4.2.0" />
     <PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
   </ItemGroup>
 
-- 
cgit v1.2.3