Compare commits
4 Commits
Canary-1.2
...
Canary-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23b0b22400 | ||
|
|
3dfbf55611 | ||
|
|
cb355f504d | ||
|
|
b5483d8fe0 |
@@ -62,7 +62,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
_api = api;
|
_api = api;
|
||||||
_physicalDevice = physicalDevice;
|
_physicalDevice = physicalDevice;
|
||||||
|
|
||||||
int totalFormats = Enum.GetNames(typeof(Format)).Length;
|
int totalFormats = Enum.GetNames<Format>().Length;
|
||||||
|
|
||||||
_bufferTable = new FormatFeatureFlags[totalFormats];
|
_bufferTable = new FormatFeatureFlags[totalFormats];
|
||||||
_optimalTable = new FormatFeatureFlags[totalFormats];
|
_optimalTable = new FormatFeatureFlags[totalFormats];
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
static FormatTable()
|
static FormatTable()
|
||||||
{
|
{
|
||||||
_table = new VkFormat[Enum.GetNames(typeof(Format)).Length];
|
_table = new VkFormat[Enum.GetNames<Format>().Length];
|
||||||
_reverseMap = new Dictionary<VkFormat, Format>();
|
_reverseMap = new Dictionary<VkFormat, Format>();
|
||||||
|
|
||||||
#pragma warning disable IDE0055 // Disable formatting
|
#pragma warning disable IDE0055 // Disable formatting
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries
|
|||||||
{
|
{
|
||||||
_pipeline = pipeline;
|
_pipeline = pipeline;
|
||||||
|
|
||||||
int count = Enum.GetNames(typeof(CounterType)).Length;
|
int count = Enum.GetNames<CounterType>().Length;
|
||||||
|
|
||||||
_counterQueues = new CounterQueue[count];
|
_counterQueues = new CounterQueue[count];
|
||||||
|
|
||||||
|
|||||||
@@ -23,18 +23,18 @@ namespace Ryujinx.HLE.HOS.Services
|
|||||||
|
|
||||||
public IpcService(ServerBase server = null)
|
public IpcService(ServerBase server = null)
|
||||||
{
|
{
|
||||||
CmifCommands = typeof(IpcService).Assembly.GetTypes()
|
CmifCommands = GetType().Assembly.GetTypes()
|
||||||
.Where(type => type == GetType())
|
.Where(type => type == GetType())
|
||||||
.SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
|
.SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
|
||||||
.SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandCmifAttribute))
|
.SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
|
||||||
.Select(command => (((CommandCmifAttribute)command).Id, methodInfo)))
|
.Select(command => (command.Id, methodInfo)))
|
||||||
.ToDictionary(command => command.Id, command => command.methodInfo);
|
.ToDictionary(command => command.Id, command => command.methodInfo);
|
||||||
|
|
||||||
TipcCommands = typeof(IpcService).Assembly.GetTypes()
|
TipcCommands = GetType().Assembly.GetTypes()
|
||||||
.Where(type => type == GetType())
|
.Where(type => type == GetType())
|
||||||
.SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
|
.SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
|
||||||
.SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandTipcAttribute))
|
.SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
|
||||||
.Select(command => (((CommandTipcAttribute)command).Id, methodInfo)))
|
.Select(command => (command.Id, methodInfo)))
|
||||||
.ToDictionary(command => command.Id, command => command.methodInfo);
|
.ToDictionary(command => command.Id, command => command.methodInfo);
|
||||||
|
|
||||||
Server = server;
|
Server = server;
|
||||||
|
|||||||
@@ -444,7 +444,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
|
|||||||
|
|
||||||
private ResultCode ScanInternal(IVirtualMemoryManager memory, ushort channel, ScanFilter scanFilter, ulong bufferPosition, ulong bufferSize, out ulong counter)
|
private ResultCode ScanInternal(IVirtualMemoryManager memory, ushort channel, ScanFilter scanFilter, ulong bufferPosition, ulong bufferSize, out ulong counter)
|
||||||
{
|
{
|
||||||
ulong networkInfoSize = (ulong)Marshal.SizeOf(typeof(NetworkInfo));
|
ulong networkInfoSize = (ulong)Marshal.SizeOf<NetworkInfo>();
|
||||||
ulong maxGames = bufferSize / networkInfoSize;
|
ulong maxGames = bufferSize / networkInfoSize;
|
||||||
|
|
||||||
MemoryHelper.FillWithZeros(memory, bufferPosition, (int)bufferSize);
|
MemoryHelper.FillWithZeros(memory, bufferPosition, (int)bufferSize);
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
|
|||||||
{
|
{
|
||||||
if (_services.TryGetValue(name, out Type type))
|
if (_services.TryGetValue(name, out Type type))
|
||||||
{
|
{
|
||||||
ServiceAttribute serviceAttribute = (ServiceAttribute)type.GetCustomAttributes(typeof(ServiceAttribute)).First(service => ((ServiceAttribute)service).Name == name);
|
ServiceAttribute serviceAttribute = type.GetCustomAttributes<ServiceAttribute>().First(service => service.Name == name);
|
||||||
|
|
||||||
IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
|
IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
|
||||||
|
|
||||||
|
|||||||
@@ -34,14 +34,14 @@ namespace Ryujinx.Horizon.Kernel.Generators
|
|||||||
private const string TypeResult = NamespaceHorizonCommon + "." + TypeResultName;
|
private const string TypeResult = NamespaceHorizonCommon + "." + TypeResultName;
|
||||||
private const string TypeExecutionContext = "IExecutionContext";
|
private const string TypeExecutionContext = "IExecutionContext";
|
||||||
|
|
||||||
private static readonly string[] _expectedResults = new string[]
|
private static readonly string[] _expectedResults =
|
||||||
{
|
[
|
||||||
$"{TypeResultName}.Success",
|
$"{TypeResultName}.Success",
|
||||||
$"{TypeKernelResultName}.TimedOut",
|
$"{TypeKernelResultName}.TimedOut",
|
||||||
$"{TypeKernelResultName}.Cancelled",
|
$"{TypeKernelResultName}.Cancelled",
|
||||||
$"{TypeKernelResultName}.PortRemoteClosed",
|
$"{TypeKernelResultName}.PortRemoteClosed",
|
||||||
$"{TypeKernelResultName}.InvalidState",
|
$"{TypeKernelResultName}.InvalidState",
|
||||||
};
|
];
|
||||||
|
|
||||||
private readonly struct OutParameter
|
private readonly struct OutParameter
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Ryujinx.UI.App.Common
|
|||||||
|
|
||||||
public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
|
public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
|
||||||
|
|
||||||
public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed) ?? LocalizedNever();
|
public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n") ?? LocalizedNever();
|
||||||
|
|
||||||
public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
|
public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
|
||||||
|
|
||||||
|
|||||||
@@ -1125,6 +1125,30 @@
|
|||||||
"zh_TW": "檢查更新"
|
"zh_TW": "檢查更新"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"ID": "MenuBarHelpFaqAndGuides",
|
||||||
|
"Translations": {
|
||||||
|
"ar_SA": "",
|
||||||
|
"de_DE": "",
|
||||||
|
"el_GR": "",
|
||||||
|
"en_US": "FAQ & Guides",
|
||||||
|
"es_ES": "",
|
||||||
|
"fr_FR": "",
|
||||||
|
"he_IL": "",
|
||||||
|
"it_IT": "",
|
||||||
|
"ja_JP": "",
|
||||||
|
"ko_KR": "",
|
||||||
|
"no_NO": "",
|
||||||
|
"pl_PL": "",
|
||||||
|
"pt_BR": "",
|
||||||
|
"ru_RU": "",
|
||||||
|
"th_TH": "",
|
||||||
|
"tr_TR": "",
|
||||||
|
"uk_UA": "",
|
||||||
|
"zh_CN": "",
|
||||||
|
"zh_TW": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ID": "MenuBarHelpFaq",
|
"ID": "MenuBarHelpFaq",
|
||||||
"Translations": {
|
"Translations": {
|
||||||
@@ -21574,4 +21598,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
|
|||||||
{
|
{
|
||||||
if (IsModified)
|
if (IsModified)
|
||||||
{
|
{
|
||||||
|
|
||||||
_playerIdChoose = value;
|
_playerIdChoose = value;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
|
|||||||
IsModified = false;
|
IsModified = false;
|
||||||
_playerId = value;
|
_playerId = value;
|
||||||
|
|
||||||
if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
|
if (!Enum.IsDefined<PlayerIndex>(_playerId))
|
||||||
{
|
{
|
||||||
_playerId = PlayerIndex.Player1;
|
_playerId = PlayerIndex.Player1;
|
||||||
|
|
||||||
|
|||||||
@@ -290,6 +290,11 @@
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
|
<MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenAboutWindow"
|
||||||
|
Header="{ext:Locale MenuBarHelpAbout}"
|
||||||
|
Icon="{ext:Icon fa-solid fa-circle-info}"
|
||||||
|
ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Name="UpdateMenuItem"
|
Name="UpdateMenuItem"
|
||||||
IsEnabled="{Binding CanUpdate}"
|
IsEnabled="{Binding CanUpdate}"
|
||||||
@@ -298,30 +303,26 @@
|
|||||||
Icon="{ext:Icon mdi-update}"
|
Icon="{ext:Icon mdi-update}"
|
||||||
ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
|
ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem
|
<MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
|
||||||
Click="MenuItem_OnClick"
|
<MenuItem
|
||||||
Header="{ext:Locale MenuBarHelpFaq}"
|
Click="MenuItem_OnClick"
|
||||||
Icon="{ext:Icon fa-github}"
|
Header="{ext:Locale MenuBarHelpFaq}"
|
||||||
Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
|
Icon="{ext:Icon fa-github}"
|
||||||
ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
|
Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
|
||||||
<MenuItem
|
ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
|
||||||
Click="MenuItem_OnClick"
|
<MenuItem
|
||||||
Header="{ext:Locale MenuBarHelpSetup}"
|
Click="MenuItem_OnClick"
|
||||||
Icon="{ext:Icon fa-github}"
|
Header="{ext:Locale MenuBarHelpSetup}"
|
||||||
Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide"
|
Icon="{ext:Icon fa-github}"
|
||||||
ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
|
Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide"
|
||||||
<MenuItem
|
ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
|
||||||
Click="MenuItem_OnClick"
|
<MenuItem
|
||||||
Header="{ext:Locale MenuBarHelpMultiplayer}"
|
Click="MenuItem_OnClick"
|
||||||
Icon="{ext:Icon fa-github}"
|
Header="{ext:Locale MenuBarHelpMultiplayer}"
|
||||||
Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
|
Icon="{ext:Icon fa-github}"
|
||||||
ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
|
Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
|
||||||
<Separator />
|
ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
|
||||||
<MenuItem
|
</MenuItem>
|
||||||
Click="OpenAboutWindow"
|
|
||||||
Header="{ext:Locale MenuBarHelpAbout}"
|
|
||||||
Icon="{ext:Icon fa-solid fa-circle-info}"
|
|
||||||
ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
|
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</Menu>
|
</Menu>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace Ryujinx.Ava.UI.Views.Main
|
|||||||
private void AspectRatioStatus_OnClick(object sender, RoutedEventArgs e)
|
private void AspectRatioStatus_OnClick(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
AspectRatio aspectRatio = ConfigurationState.Instance.Graphics.AspectRatio.Value;
|
AspectRatio aspectRatio = ConfigurationState.Instance.Graphics.AspectRatio.Value;
|
||||||
ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames(typeof(AspectRatio)).Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
|
ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames<AspectRatio>().Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Refresh_OnClick(object sender, RoutedEventArgs e) => Window.LoadApplications();
|
private void Refresh_OnClick(object sender, RoutedEventArgs e) => Window.LoadApplications();
|
||||||
|
|||||||
Reference in New Issue
Block a user