1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-12-20 06:52:06 +00:00

Get it building again

This commit is contained in:
Isaac Marovitz 2024-01-14 12:33:59 -05:00 committed by Isaac Marovitz
parent b9c4a23f22
commit b439a52ac7
3 changed files with 16 additions and 4 deletions

View file

@ -52,6 +52,11 @@ namespace Ryujinx.Graphics.Metal
return CreateBuffer(size, BufferAccess.Default); return CreateBuffer(size, BufferAccess.Default);
} }
public BufferHandle CreateBuffer(int size, BufferAccess access, BufferHandle storageHint)
{
throw new NotImplementedException();
}
public BufferHandle CreateBuffer(IntPtr pointer, int size) public BufferHandle CreateBuffer(IntPtr pointer, int size)
{ {
var buffer = _device.NewBuffer(pointer, (ulong)size, MTLResourceOptions.ResourceStorageModeShared); var buffer = _device.NewBuffer(pointer, (ulong)size, MTLResourceOptions.ResourceStorageModeShared);
@ -59,6 +64,11 @@ namespace Ryujinx.Graphics.Metal
return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr); return Unsafe.As<IntPtr, BufferHandle>(ref bufferPtr);
} }
public BufferHandle CreateBufferSparse(ReadOnlySpan<BufferRange> storageBuffers)
{
throw new NotImplementedException();
}
public BufferHandle CreateBuffer(int size, BufferAccess access) public BufferHandle CreateBuffer(int size, BufferAccess access)
{ {
var buffer = _device.NewBuffer((ulong)size, MTLResourceOptions.ResourceStorageModeShared); var buffer = _device.NewBuffer((ulong)size, MTLResourceOptions.ResourceStorageModeShared);
@ -150,6 +160,7 @@ namespace Ryujinx.Graphics.Metal
supportsR4G4Format: false, supportsR4G4Format: false,
supportsR4G4B4A4Format: true, supportsR4G4B4A4Format: true,
supportsSnormBufferTextureFormat: true, supportsSnormBufferTextureFormat: true,
supportsSparseBuffer: false,
supports5BitComponentFormat: true, supports5BitComponentFormat: true,
supportsBlendEquationAdvanced: false, supportsBlendEquationAdvanced: false,
supportsFragmentShaderInterlock: true, supportsFragmentShaderInterlock: true,
@ -166,6 +177,7 @@ namespace Ryujinx.Graphics.Metal
supportsShaderBallot: false, supportsShaderBallot: false,
supportsShaderBarrierDivergence: false, supportsShaderBarrierDivergence: false,
supportsShaderFloat64: false, supportsShaderFloat64: false,
supportsTextureGatherOffsets: false,
supportsTextureShadowLod: false, supportsTextureShadowLod: false,
supportsVertexStoreAndAtomics: false, supportsVertexStoreAndAtomics: false,
supportsViewportIndexVertexTessellation: false, supportsViewportIndexVertexTessellation: false,

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
@ -9,7 +9,7 @@
<ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" /> <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
<ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" /> <ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SharpMetal" /> <PackageReference Include="SharpMetal" />
</ItemGroup> </ItemGroup>
@ -18,4 +18,4 @@
<EmbeddedResource Include="HelperShadersSource.metal" /> <EmbeddedResource Include="HelperShadersSource.metal" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -1072,7 +1072,7 @@ namespace Ryujinx.Ava
StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs( StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
Device.EnableDeviceVsync, Device.EnableDeviceVsync,
LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%", LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
ConfigurationState.Instance.Graphics.GraphicsBackend.Value.ToText(), ConfigurationState.Instance.Graphics.GraphicsBackend.Value.ToString(),
dockedMode, dockedMode,
ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(), ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
LocaleManager.Instance[LocaleKeys.Game] + $": {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)", LocaleManager.Instance[LocaleKeys.Game] + $": {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",