Compare commits
5 Commits
Canary-1.2
...
Canary-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1fbb0d8e7d | ||
|
|
9ee3f1ff36 | ||
|
|
d052d74ac4 | ||
|
|
df91c4c57a | ||
|
|
2aaaa7872f |
@@ -35,6 +35,7 @@ namespace Ryujinx.Common
|
|||||||
"010028600EBDA000", // Mario 3D World
|
"010028600EBDA000", // Mario 3D World
|
||||||
"0100152000022000", // Mario Kart 8 Deluxe
|
"0100152000022000", // Mario Kart 8 Deluxe
|
||||||
"01005CA01580E000", // Persona 5
|
"01005CA01580E000", // Persona 5
|
||||||
|
"01001f5010dfa000", // Pokemon Legends Arceus
|
||||||
"01008C0016544000", // Sea of Stars
|
"01008C0016544000", // Sea of Stars
|
||||||
"01006A800016E000", // Smash Ultimate
|
"01006A800016E000", // Smash Ultimate
|
||||||
"0100000000010000", // Super Mario Odyessy
|
"0100000000010000", // Super Mario Odyessy
|
||||||
|
|||||||
@@ -22,13 +22,15 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
|
|
||||||
private int _requestedWidth;
|
private int _requestedWidth;
|
||||||
private int _requestedHeight;
|
private int _requestedHeight;
|
||||||
|
|
||||||
// private bool _vsyncEnabled;
|
|
||||||
private AntiAliasing _currentAntiAliasing;
|
private AntiAliasing _currentAntiAliasing;
|
||||||
private bool _updateEffect;
|
private bool _updateEffect;
|
||||||
private IPostProcessingEffect _effect;
|
private IPostProcessingEffect _effect;
|
||||||
private IScalingFilter _scalingFilter;
|
private IScalingFilter _scalingFilter;
|
||||||
private bool _isLinear;
|
private bool _isLinear;
|
||||||
|
|
||||||
|
public bool IsVSyncEnabled => _metalLayer.DisplaySyncEnabled;
|
||||||
|
|
||||||
// private float _scalingFilterLevel;
|
// private float _scalingFilterLevel;
|
||||||
private bool _updateScalingFilter;
|
private bool _updateScalingFilter;
|
||||||
private ScalingFilter _currentScalingFilter;
|
private ScalingFilter _currentScalingFilter;
|
||||||
@@ -40,7 +42,7 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
_metalLayer = metalLayer;
|
_metalLayer = metalLayer;
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void ResizeIfNeeded()
|
private void ResizeIfNeeded()
|
||||||
{
|
{
|
||||||
if (_requestedWidth != 0 && _requestedHeight != 0)
|
if (_requestedWidth != 0 && _requestedHeight != 0)
|
||||||
{
|
{
|
||||||
@@ -54,7 +56,7 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public unsafe void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
|
public void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
|
||||||
{
|
{
|
||||||
if (_renderer.Pipeline is Pipeline pipeline && texture is Texture tex)
|
if (_renderer.Pipeline is Pipeline pipeline && texture is Texture tex)
|
||||||
{
|
{
|
||||||
@@ -141,15 +143,7 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
|
|
||||||
public void ChangeVSyncMode(VSyncMode vSyncMode)
|
public void ChangeVSyncMode(VSyncMode vSyncMode)
|
||||||
{
|
{
|
||||||
switch (vSyncMode)
|
_metalLayer.DisplaySyncEnabled = vSyncMode is VSyncMode.Switch;
|
||||||
{
|
|
||||||
case VSyncMode.Unbounded:
|
|
||||||
_metalLayer.DisplaySyncEnabled = false;
|
|
||||||
break;
|
|
||||||
case VSyncMode.Switch:
|
|
||||||
_metalLayer.DisplaySyncEnabled = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetAntiAliasing(AntiAliasing effect)
|
public void SetAntiAliasing(AntiAliasing effect)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Gommon;
|
||||||
using Ryujinx.Common.Configuration;
|
using Ryujinx.Common.Configuration;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Graphics.GAL;
|
using Ryujinx.Graphics.GAL;
|
||||||
@@ -890,7 +891,12 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
private void PrintGpuInformation()
|
private void PrintGpuInformation()
|
||||||
{
|
{
|
||||||
Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion})");
|
string gpuInfoMessage = $"{GpuRenderer} ({GpuVersion})";
|
||||||
|
if (!GpuRenderer.StartsWithIgnoreCase(GpuVendor))
|
||||||
|
gpuInfoMessage = gpuInfoMessage.Prepend(GpuVendor);
|
||||||
|
|
||||||
|
Logger.Notice.Print(LogClass.Gpu, gpuInfoMessage);
|
||||||
|
|
||||||
Logger.Notice.Print(LogClass.Gpu, $"GPU Memory: {GetTotalGPUMemory() / (1024 * 1024)} MiB");
|
Logger.Notice.Print(LogClass.Gpu, $"GPU Memory: {GetTotalGPUMemory() / (1024 * 1024)} MiB");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17426,25 +17426,25 @@
|
|||||||
"ID": "TitleUpdateVersionLabel",
|
"ID": "TitleUpdateVersionLabel",
|
||||||
"Translations": {
|
"Translations": {
|
||||||
"ar_SA": "الإصدار: {0}",
|
"ar_SA": "الإصدار: {0}",
|
||||||
"de_DE": "Version {0} - {1}",
|
"de_DE": "",
|
||||||
"el_GR": "Version {0} - {1}",
|
"el_GR": "",
|
||||||
"en_US": "Version {0} - {1}",
|
"en_US": "Version {0}",
|
||||||
"es_ES": "Versión {0} - {1}",
|
"es_ES": "Versión {0}",
|
||||||
"fr_FR": "",
|
"fr_FR": "",
|
||||||
"he_IL": "גרסה {0} - {1}",
|
"he_IL": "גרסה: {0}",
|
||||||
"it_IT": "Versione {0} - {1}",
|
"it_IT": "Versione {0}",
|
||||||
"ja_JP": "バージョン {0} - {1}",
|
"ja_JP": "バージョン {0}",
|
||||||
"ko_KR": "버전 {0} - {1}",
|
"ko_KR": "버전 {0}",
|
||||||
"no_NO": "Versjon {0} - {1}",
|
"no_NO": "Versjon {0}",
|
||||||
"pl_PL": "Wersja {0} - {1}",
|
"pl_PL": "Wersja {0}",
|
||||||
"pt_BR": "Versão {0} - {1}",
|
"pt_BR": "Versão {0}",
|
||||||
"ru_RU": "Версия {0} - {1}",
|
"ru_RU": "Версия {0}",
|
||||||
"sv_SE": "Version {0} - {1}",
|
"sv_SE": "Version {0}",
|
||||||
"th_TH": "เวอร์ชั่น {0} - {1}",
|
"th_TH": "เวอร์ชั่น {0}",
|
||||||
"tr_TR": "Sürüm {0} - {1}",
|
"tr_TR": "Sürüm {0}",
|
||||||
"uk_UA": "Версія {0} - {1}",
|
"uk_UA": "Версія {0}",
|
||||||
"zh_CN": "游戏更新的版本 {0} - {1}",
|
"zh_CN": "游戏更新的版本 {0}",
|
||||||
"zh_TW": "版本 {0} - {1}"
|
"zh_TW": "版本 {0}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -22598,4 +22598,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Avalonia.Collections;
|
using Avalonia.Collections;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
|
using Gommon;
|
||||||
using LibHac.Tools.FsSystem;
|
using LibHac.Tools.FsSystem;
|
||||||
using Ryujinx.Audio.Backends.OpenAL;
|
using Ryujinx.Audio.Backends.OpenAL;
|
||||||
using Ryujinx.Audio.Backends.SDL2;
|
using Ryujinx.Audio.Backends.SDL2;
|
||||||
@@ -796,7 +797,17 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
CloseWindow?.Invoke();
|
CloseWindow?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Xc2MenuFixTooltip =>
|
public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
|
||||||
"From the issue on GitHub:\n\nWhen clicking very fast from game main menu to 2nd submenu, there is a low chance that the game will softlock, the submenu won't show up, while background music is still there.";
|
{
|
||||||
|
sb.AppendLine(
|
||||||
|
"This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
|
||||||
|
.AppendLine();
|
||||||
|
|
||||||
|
sb.AppendLine("From the issue on GitHub:").AppendLine();
|
||||||
|
sb.Append(
|
||||||
|
"When clicking very fast from game main menu to 2nd submenu, " +
|
||||||
|
"there is a low chance that the game will softlock, " +
|
||||||
|
"the submenu won't show up, while background music is still there.");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user