mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.NET Core 3.0 is here! (#784)

Browse source 
* .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 1772128ce0.

* Update SvcTable.cs
This commit is contained in:
LDj3SNuD 2019-10-31 19:09:03 +01:00 • committed by Ac_K
parent 35443bac5a
commit eee639d6ba
208 changed files with 138 additions and 27346 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
View file

@ -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);

4
Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
View file

@ -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);
}
}
}

4
Ryujinx.Graphics/Memory/NvGpuVmm.cs
View file

@ -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;

4
Ryujinx.Graphics/Memory/NvGpuVmmCache.cs
View file

@ -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;

4
Ryujinx.Graphics/Ryujinx.Graphics.csproj
View file

@ -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>