mirrors/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-12-29 18:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Redundant Qualifer Warnings (#4091)

Browse source 
* Fix Redundant Qualifer Warnings

* Remove unnecessary using
This commit is contained in:
Isaac Marovitz 2022-12-10 15:21:13 -05:00 committed by GitHub
parent 459c4caeba
commit 851d81d24a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 57 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Ava/Modules/Updater/Updater.cs
View file

@ -355,7 +355,7 @@ namespace Ryujinx.Modules
list[index] = args.Result; list[index] = args.Result;
Interlocked.Increment(ref completedRequests); Interlocked.Increment(ref completedRequests);
if (Interlocked.Equals(completedRequests, ConnectionCount)) if (Equals(completedRequests, ConnectionCount))
{ {
byte[] mergedFileBytes = new byte[_buildSize]; byte[] mergedFileBytes = new byte[_buildSize];
for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++) for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++)

2
Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs
View file

@ -66,7 +66,7 @@ namespace Ryujinx.Ava.Ui.Applet
}); });
} }
private void AvaloniaDynamicTextInputHandler_KeyRelease(object sender, Avalonia.Input.KeyEventArgs e) private void AvaloniaDynamicTextInputHandler_KeyRelease(object sender, KeyEventArgs e)
{ {
var key = (HidKey)AvaloniaKeyboardMappingHelper.ToInputKey(e.Key); var key = (HidKey)AvaloniaKeyboardMappingHelper.ToInputKey(e.Key);

10
Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
View file

@ -222,7 +222,7 @@ namespace Ryujinx.Ava.Ui.Controls
content.MinHeight = 80; content.MinHeight = 80;
SymbolIcon icon = new SymbolIcon { Symbol = (Symbol)symbol, Margin = new Avalonia.Thickness(10) }; SymbolIcon icon = new SymbolIcon { Symbol = (Symbol)symbol, Margin = new Thickness(10) };
icon.FontSize = 40; icon.FontSize = 40;
icon.VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center; icon.VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center;
Grid.SetColumn(icon, 0); Grid.SetColumn(icon, 0);
@ -232,15 +232,15 @@ namespace Ryujinx.Ava.Ui.Controls
TextBlock primaryLabel = new TextBlock() TextBlock primaryLabel = new TextBlock()
{ {
Text = primaryText, Text = primaryText,
Margin = new Avalonia.Thickness(5), Margin = new Thickness(5),
TextWrapping = Avalonia.Media.TextWrapping.Wrap, TextWrapping = TextWrapping.Wrap,
MaxWidth = 450 MaxWidth = 450
}; };
TextBlock secondaryLabel = new TextBlock() TextBlock secondaryLabel = new TextBlock()
{ {
Text = secondaryText, Text = secondaryText,
Margin = new Avalonia.Thickness(5), Margin = new Thickness(5),
TextWrapping = Avalonia.Media.TextWrapping.Wrap, TextWrapping = TextWrapping.Wrap,
MaxWidth = 450 MaxWidth = 450
}; };

8
Ryujinx.Ava/Ui/Controls/EmbeddedWindow.cs
View file

@ -39,7 +39,7 @@ namespace Ryujinx.Ava.Ui.Controls
public EmbeddedWindow() public EmbeddedWindow()
{ {
var stateObserverable = this.GetObservable(Control.BoundsProperty); var stateObserverable = this.GetObservable(BoundsProperty);
stateObserverable.Subscribe(StateChanged); stateObserverable.Subscribe(StateChanged);
@ -165,7 +165,7 @@ namespace Ryujinx.Ava.Ui.Controls
isLeft = msg == WindowsMessages.LBUTTONDOWN; isLeft = msg == WindowsMessages.LBUTTONDOWN;
this.RaiseEvent(new PointerPressedEventArgs( this.RaiseEvent(new PointerPressedEventArgs(
this, this,
new Avalonia.Input.Pointer(0, PointerType.Mouse, true), new Pointer(0, PointerType.Mouse, true),
root, root,
this.TranslatePoint(point, root).Value, this.TranslatePoint(point, root).Value,
(ulong)Environment.TickCount64, (ulong)Environment.TickCount64,
@ -177,7 +177,7 @@ namespace Ryujinx.Ava.Ui.Controls
isLeft = msg == WindowsMessages.LBUTTONUP; isLeft = msg == WindowsMessages.LBUTTONUP;
this.RaiseEvent(new PointerReleasedEventArgs( this.RaiseEvent(new PointerReleasedEventArgs(
this, this,
new Avalonia.Input.Pointer(0, PointerType.Mouse, true), new Pointer(0, PointerType.Mouse, true),
root, root,
this.TranslatePoint(point, root).Value, this.TranslatePoint(point, root).Value,
(ulong)Environment.TickCount64, (ulong)Environment.TickCount64,
@ -189,7 +189,7 @@ namespace Ryujinx.Ava.Ui.Controls
this.RaiseEvent(new PointerEventArgs( this.RaiseEvent(new PointerEventArgs(
PointerMovedEvent, PointerMovedEvent,
this, this,
new Avalonia.Input.Pointer(0, PointerType.Mouse, true), new Pointer(0, PointerType.Mouse, true),
root, root,
this.TranslatePoint(point, root).Value, this.TranslatePoint(point, root).Value,
(ulong)Environment.TickCount64, (ulong)Environment.TickCount64,

4
Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs
View file

@ -545,7 +545,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
config = new StandardKeyboardInputConfig config = new StandardKeyboardInputConfig
{ {
Version = Ryujinx.Common.Configuration.Hid.InputConfig.CurrentVersion, Version = InputConfig.CurrentVersion,
Backend = InputBackendType.WindowKeyboard, Backend = InputBackendType.WindowKeyboard,
Id = id, Id = id,
ControllerType = ControllerType.ProController, ControllerType = ControllerType.ProController,
@ -600,7 +600,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
config = new StandardControllerInputConfig config = new StandardControllerInputConfig
{ {
Version = Ryujinx.Common.Configuration.Hid.InputConfig.CurrentVersion, Version = InputConfig.CurrentVersion,
Backend = InputBackendType.GamepadSDL2, Backend = InputBackendType.GamepadSDL2,
Id = id, Id = id,
ControllerType = ControllerType.ProController, ControllerType = ControllerType.ProController,

4
Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs
View file

@ -104,11 +104,11 @@ namespace Ryujinx.Ava.Ui.Windows
var device = ViewModel.Devices[ViewModel.Device]; var device = ViewModel.Devices[ViewModel.Device];
if (device.Type == Models.DeviceType.Keyboard) if (device.Type == DeviceType.Keyboard)
{ {
assigner = new KeyboardKeyAssigner((IKeyboard)ViewModel.SelectedGamepad); assigner = new KeyboardKeyAssigner((IKeyboard)ViewModel.SelectedGamepad);
} }
else if (device.Type == Models.DeviceType.Controller) else if (device.Type == DeviceType.Controller)
{ {
assigner = new GamepadButtonAssigner(ViewModel.SelectedGamepad, (ViewModel.Config as StandardControllerInputConfig).TriggerThreshold, forStick); assigner = new GamepadButtonAssigner(ViewModel.SelectedGamepad, (ViewModel.Config as StandardControllerInputConfig).TriggerThreshold, forStick);
} }

2
Ryujinx.Graphics.GAL/SamplerCreateInfo.cs
View file

@ -61,7 +61,7 @@ namespace Ryujinx.Graphics.GAL
AddressMode.ClampToEdge, AddressMode.ClampToEdge,
AddressMode.ClampToEdge, AddressMode.ClampToEdge,
CompareMode.None, CompareMode.None,
GAL.CompareOp.Always, CompareOp.Always,
new ColorF(0f, 0f, 0f, 0f), new ColorF(0f, 0f, 0f, 0f),
0f, 0f,
0f, 0f,

6
Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
View file

@ -110,7 +110,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <summary> /// <summary>
/// Texture target. /// Texture target.
/// </summary> /// </summary>
public Image.TextureTarget TextureTarget; public TextureTarget TextureTarget;
/// <summary> /// <summary>
/// Indicates if the coordinates used to sample the texture are normalized or not (0.0..1.0 or 0..Width/Height). /// Indicates if the coordinates used to sample the texture are normalized or not (0.0..1.0 or 0..Width/Height).
@ -331,7 +331,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
int cbufSlot, int cbufSlot,
uint format, uint format,
bool formatSrgb, bool formatSrgb,
Image.TextureTarget target, TextureTarget target,
bool coordNormalized) bool coordNormalized)
{ {
Box<TextureSpecializationState> state = GetOrCreateTextureSpecState(stageIndex, handle, cbufSlot); Box<TextureSpecializationState> state = GetOrCreateTextureSpecState(stageIndex, handle, cbufSlot);
@ -415,7 +415,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <param name="stageIndex">Shader stage where the texture is used</param> /// <param name="stageIndex">Shader stage where the texture is used</param>
/// <param name="handle">Offset in words of the texture handle on the texture buffer</param> /// <param name="handle">Offset in words of the texture handle on the texture buffer</param>
/// <param name="cbufSlot">Slot of the texture buffer constant buffer</param> /// <param name="cbufSlot">Slot of the texture buffer constant buffer</param>
public Image.TextureTarget GetTextureTarget(int stageIndex, int handle, int cbufSlot) public TextureTarget GetTextureTarget(int stageIndex, int handle, int cbufSlot)
{ {
return GetTextureSpecState(stageIndex, handle, cbufSlot).Value.TextureTarget; return GetTextureSpecState(stageIndex, handle, cbufSlot).Value.TextureTarget;
} }

6
Ryujinx.Graphics.Shader/CodeGen/Spirv/Declarations.cs
View file

@ -10,8 +10,6 @@ using static Spv.Specification;
namespace Ryujinx.Graphics.Shader.CodeGen.Spirv namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
{ {
using SpvInstruction = Spv.Generator.Instruction;
static class Declarations static class Declarations
{ {
// At least 16 attributes are guaranteed by the spec. // At least 16 attributes are guaranteed by the spec.
@ -60,7 +58,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
for (int funcIndex = 0; funcIndex < functions.Count; funcIndex++) for (int funcIndex = 0; funcIndex < functions.Count; funcIndex++)
{ {
StructuredFunction function = functions[funcIndex]; StructuredFunction function = functions[funcIndex];
SpvInstruction[] locals = new SpvInstruction[function.InArguments.Length]; Instruction[] locals = new Instruction[function.InArguments.Length];
for (int i = 0; i < function.InArguments.Length; i++) for (int i = 0; i < function.InArguments.Length; i++)
{ {
@ -122,7 +120,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
context.SharedMemory = DeclareMemory(context, StorageClass.Workgroup, size); context.SharedMemory = DeclareMemory(context, StorageClass.Workgroup, size);
} }
private static SpvInstruction DeclareMemory(CodeGenContext context, StorageClass storage, int size) private static Instruction DeclareMemory(CodeGenContext context, StorageClass storage, int size)
{ {
var arrayType = context.TypeArray(context.TypeU32(), context.Constant(context.TypeU32(), size)); var arrayType = context.TypeArray(context.TypeU32(), context.Constant(context.TypeU32(), size));
var pointerType = context.TypePointer(storage, arrayType); var pointerType = context.TypePointer(storage, arrayType);

8
Ryujinx.Graphics.Vulkan/BufferHolder.cs
View file

@ -272,7 +272,7 @@ namespace Ryujinx.Graphics.Vulkan
_gd, _gd,
cbs.CommandBuffer, cbs.CommandBuffer,
dstBuffer, dstBuffer,
BufferHolder.DefaultAccessFlags, DefaultAccessFlags,
AccessFlags.TransferWriteBit, AccessFlags.TransferWriteBit,
PipelineStageFlags.AllCommandsBit, PipelineStageFlags.AllCommandsBit,
PipelineStageFlags.TransferBit, PipelineStageFlags.TransferBit,
@ -294,7 +294,7 @@ namespace Ryujinx.Graphics.Vulkan
cbs.CommandBuffer, cbs.CommandBuffer,
dstBuffer, dstBuffer,
AccessFlags.TransferWriteBit, AccessFlags.TransferWriteBit,
BufferHolder.DefaultAccessFlags, DefaultAccessFlags,
PipelineStageFlags.TransferBit, PipelineStageFlags.TransferBit,
PipelineStageFlags.AllCommandsBit, PipelineStageFlags.AllCommandsBit,
dstOffset, dstOffset,
@ -319,7 +319,7 @@ namespace Ryujinx.Graphics.Vulkan
gd, gd,
cbs.CommandBuffer, cbs.CommandBuffer,
dstBuffer, dstBuffer,
BufferHolder.DefaultAccessFlags, DefaultAccessFlags,
AccessFlags.TransferWriteBit, AccessFlags.TransferWriteBit,
PipelineStageFlags.AllCommandsBit, PipelineStageFlags.AllCommandsBit,
PipelineStageFlags.TransferBit, PipelineStageFlags.TransferBit,
@ -335,7 +335,7 @@ namespace Ryujinx.Graphics.Vulkan
cbs.CommandBuffer, cbs.CommandBuffer,
dstBuffer, dstBuffer,
AccessFlags.TransferWriteBit, AccessFlags.TransferWriteBit,
BufferHolder.DefaultAccessFlags, DefaultAccessFlags,
PipelineStageFlags.TransferBit, PipelineStageFlags.TransferBit,
PipelineStageFlags.AllCommandsBit, PipelineStageFlags.AllCommandsBit,
dstOffset, dstOffset,

2
Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
View file

@ -97,7 +97,7 @@ namespace Ryujinx.Graphics.Vulkan
_dummyBuffer = gd.BufferManager.Create(gd, 0x10000, forConditionalRendering: false, deviceLocal: true); _dummyBuffer = gd.BufferManager.Create(gd, 0x10000, forConditionalRendering: false, deviceLocal: true);
} }
_dummyTexture = gd.CreateTextureView(new GAL.TextureCreateInfo( _dummyTexture = gd.CreateTextureView(new TextureCreateInfo(
1, 1,
1, 1,
1, 1,

2
Ryujinx.Graphics.Vulkan/DisposableBufferView.cs
View file

@ -3,7 +3,7 @@ using System;
namespace Ryujinx.Graphics.Vulkan namespace Ryujinx.Graphics.Vulkan
{ {
readonly struct DisposableBufferView : System.IDisposable readonly struct DisposableBufferView : IDisposable
{ {
private readonly Vk _api; private readonly Vk _api;
private readonly Device _device; private readonly Device _device;

24
Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
View file

@ -86,7 +86,7 @@ namespace Ryujinx.Graphics.Vulkan
iter++; iter++;
} }
DescriptorSetLayout[] layouts = new DescriptorSetLayout[PipelineFull.DescriptorSetLayouts]; DescriptorSetLayout[] layouts = new DescriptorSetLayout[PipelineBase.DescriptorSetLayouts];
var uDescriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo() var uDescriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo()
{ {
@ -117,10 +117,10 @@ namespace Ryujinx.Graphics.Vulkan
BindingCount = (uint)iCount BindingCount = (uint)iCount
}; };
gd.Api.CreateDescriptorSetLayout(device, uDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.UniformSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, uDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.UniformSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, sDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.StorageSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, sDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.StorageSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, tDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.TextureSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, tDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.TextureSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, iDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.ImageSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, iDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.ImageSetIndex]).ThrowOnError();
fixed (DescriptorSetLayout* pLayouts = layouts) fixed (DescriptorSetLayout* pLayouts = layouts)
{ {
@ -128,7 +128,7 @@ namespace Ryujinx.Graphics.Vulkan
{ {
SType = StructureType.PipelineLayoutCreateInfo, SType = StructureType.PipelineLayoutCreateInfo,
PSetLayouts = pLayouts, PSetLayouts = pLayouts,
SetLayoutCount = PipelineFull.DescriptorSetLayouts SetLayoutCount = PipelineBase.DescriptorSetLayouts
}; };
gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError(); gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError();
@ -191,7 +191,7 @@ namespace Ryujinx.Graphics.Vulkan
Set(iLayoutBindings, DescriptorType.StorageImage, ref iIndex, shader.Bindings.ImageBindings); Set(iLayoutBindings, DescriptorType.StorageImage, ref iIndex, shader.Bindings.ImageBindings);
} }
DescriptorSetLayout[] layouts = new DescriptorSetLayout[PipelineFull.DescriptorSetLayouts]; DescriptorSetLayout[] layouts = new DescriptorSetLayout[PipelineBase.DescriptorSetLayouts];
var uDescriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo() var uDescriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo()
{ {
@ -221,10 +221,10 @@ namespace Ryujinx.Graphics.Vulkan
BindingCount = (uint)iCount BindingCount = (uint)iCount
}; };
gd.Api.CreateDescriptorSetLayout(device, uDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.UniformSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, uDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.UniformSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, sDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.StorageSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, sDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.StorageSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, tDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.TextureSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, tDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.TextureSetIndex]).ThrowOnError();
gd.Api.CreateDescriptorSetLayout(device, iDescriptorSetLayoutCreateInfo, null, out layouts[PipelineFull.ImageSetIndex]).ThrowOnError(); gd.Api.CreateDescriptorSetLayout(device, iDescriptorSetLayoutCreateInfo, null, out layouts[PipelineBase.ImageSetIndex]).ThrowOnError();
fixed (DescriptorSetLayout* pLayouts = layouts) fixed (DescriptorSetLayout* pLayouts = layouts)
{ {
@ -232,7 +232,7 @@ namespace Ryujinx.Graphics.Vulkan
{ {
SType = StructureType.PipelineLayoutCreateInfo, SType = StructureType.PipelineLayoutCreateInfo,
PSetLayouts = pLayouts, PSetLayouts = pLayouts,
SetLayoutCount = PipelineFull.DescriptorSetLayouts SetLayoutCount = PipelineBase.DescriptorSetLayouts
}; };
gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError(); gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError();

4
Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
View file

@ -157,7 +157,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
int supportedLanguages = (int)context.Device.Application.ControlData.Value.SupportedLanguageFlag; int supportedLanguages = (int)context.Device.Application.ControlData.Value.SupportedLanguageFlag;
int firstSupported = BitOperations.TrailingZeroCount(supportedLanguages); int firstSupported = BitOperations.TrailingZeroCount(supportedLanguages);
if (firstSupported > (int)SystemState.TitleLanguage.BrazilianPortuguese) if (firstSupported > (int)TitleLanguage.BrazilianPortuguese)
{ {
Logger.Warning?.Print(LogClass.ServiceAm, "Application has zero supported languages"); Logger.Warning?.Print(LogClass.ServiceAm, "Application has zero supported languages");
@ -170,7 +170,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
// TODO: In the future, a GUI could enable user-specified search priority // TODO: In the future, a GUI could enable user-specified search priority
if (((1 << (int)context.Device.System.State.DesiredTitleLanguage) & supportedLanguages) == 0) if (((1 << (int)context.Device.System.State.DesiredTitleLanguage) & supportedLanguages) == 0)
{ {
SystemLanguage newLanguage = Enum.Parse<SystemLanguage>(Enum.GetName(typeof(SystemState.TitleLanguage), firstSupported)); SystemLanguage newLanguage = Enum.Parse<SystemLanguage>(Enum.GetName(typeof(TitleLanguage), firstSupported));
desiredLanguageCode = SystemStateMgr.GetLanguageCode((int)newLanguage); desiredLanguageCode = SystemStateMgr.GetLanguageCode((int)newLanguage);
Logger.Info?.Print(LogClass.ServiceAm, $"Application doesn't support configured language. Using {newLanguage}"); Logger.Info?.Print(LogClass.ServiceAm, $"Application doesn't support configured language. Using {newLanguage}");

2
Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
View file

@ -901,7 +901,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
[CommandHipc(606)] [CommandHipc(606)]
public ResultCode GetRightsId(ServiceCtx context) public ResultCode GetRightsId(ServiceCtx context)
{ {
LibHac.Ncm.StorageId storageId = (LibHac.Ncm.StorageId)context.RequestData.ReadInt64(); StorageId storageId = (StorageId)context.RequestData.ReadInt64();
ProgramId programId = context.RequestData.ReadStruct<ProgramId>(); ProgramId programId = context.RequestData.ReadStruct<ProgramId>();
Result result = _baseFileSystemProxy.Get.GetRightsId(out RightsId rightsId, programId, storageId); Result result = _baseFileSystemProxy.Get.GetRightsId(out RightsId rightsId, programId, storageId);

2
Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs
View file

@ -130,7 +130,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
} }
List<(int Offset, string Location, string Abbr)> outList = new List<(int Offset, string Location, string Abbr)>(); List<(int Offset, string Location, string Abbr)> outList = new List<(int Offset, string Location, string Abbr)>();
var now = System.DateTimeOffset.Now.ToUnixTimeSeconds(); var now = DateTimeOffset.Now.ToUnixTimeSeconds();
using (IStorage ncaStorage = new LocalStorage(_virtualFileSystem.SwitchPathToSystemPath(tzBinaryContentPath), FileAccess.Read, FileMode.Open)) using (IStorage ncaStorage = new LocalStorage(_virtualFileSystem.SwitchPathToSystemPath(tzBinaryContentPath), FileAccess.Read, FileMode.Open))
using (IFileSystem romfs = new Nca(_virtualFileSystem.KeySet, ncaStorage).OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel)) using (IFileSystem romfs = new Nca(_virtualFileSystem.KeySet, ncaStorage).OpenFileSystem(NcaSectionType.Data, _fsIntegrityCheckLevel))
{ {

6
Ryujinx.Tests.Unicorn/UnicornAArch32.cs
View file

@ -122,14 +122,14 @@ namespace Ryujinx.Tests.Unicorn
{ {
if (!_isDisposed) if (!_isDisposed)
{ {
Interface.Checked(Native.Interface.uc_close(uc)); Interface.Checked(Interface.uc_close(uc));
_isDisposed = true; _isDisposed = true;
} }
} }
public void RunForCount(ulong count) public void RunForCount(ulong count)
{ {
Interface.Checked(Native.Interface.uc_emu_start(uc, this.PC, 0xFFFFFFFFFFFFFFFFu, 0, count)); Interface.Checked(Interface.uc_emu_start(uc, this.PC, 0xFFFFFFFFFFFFFFFFu, 0, count));
} }
public void Step() public void Step()
@ -222,7 +222,7 @@ namespace Ryujinx.Tests.Unicorn
{ {
byte[] data = new byte[4]; byte[] data = new byte[4];
Interface.Checked(Native.Interface.uc_reg_read(uc, (int)register, data)); Interface.Checked(Interface.uc_reg_read(uc, (int)register, data));
return (uint)BitConverter.ToInt32(data, 0); return (uint)BitConverter.ToInt32(data, 0);
} }

6
Ryujinx.Tests.Unicorn/UnicornAArch64.cs
View file

@ -111,14 +111,14 @@ namespace Ryujinx.Tests.Unicorn
{ {
if (!_isDisposed) if (!_isDisposed)
{ {
Interface.Checked(Native.Interface.uc_close(uc)); Interface.Checked(Interface.uc_close(uc));
_isDisposed = true; _isDisposed = true;
} }
} }
public void RunForCount(ulong count) public void RunForCount(ulong count)
{ {
Interface.Checked(Native.Interface.uc_emu_start(uc, this.PC, 0xFFFFFFFFFFFFFFFFu, 0, count)); Interface.Checked(Interface.uc_emu_start(uc, this.PC, 0xFFFFFFFFFFFFFFFFu, 0, count));
} }
public void Step() public void Step()
@ -241,7 +241,7 @@ namespace Ryujinx.Tests.Unicorn
{ {
byte[] data = new byte[8]; byte[] data = new byte[8];
Interface.Checked(Native.Interface.uc_reg_read(uc, (int)register, data)); Interface.Checked(Interface.uc_reg_read(uc, (int)register, data));
return (ulong)BitConverter.ToInt64(data, 0); return (ulong)BitConverter.ToInt64(data, 0);
} }

2
Ryujinx/Modules/Updater/UpdateDialog.cs
View file

@ -32,7 +32,7 @@ namespace Ryujinx.Modules
_mainWindow = mainWindow; _mainWindow = mainWindow;
_buildUrl = buildUrl; _buildUrl = buildUrl;
Icon = new Gdk.Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png"); Icon = new Pixbuf(Assembly.GetAssembly(typeof(ConfigurationState)), "Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png");
MainText.Text = "Do you want to update Ryujinx to the latest version?"; MainText.Text = "Do you want to update Ryujinx to the latest version?";
SecondaryText.Text = $"{Program.Version} -> {newVersion}"; SecondaryText.Text = $"{Program.Version} -> {newVersion}";

2
Ryujinx/Modules/Updater/Updater.cs
View file

@ -293,7 +293,7 @@ namespace Ryujinx.Modules
list[index] = args.Result; list[index] = args.Result;
Interlocked.Increment(ref completedRequests); Interlocked.Increment(ref completedRequests);
if (Interlocked.Equals(completedRequests, ConnectionCount)) if (Equals(completedRequests, ConnectionCount))
{ {
byte[] mergedFileBytes = new byte[_buildSize]; byte[] mergedFileBytes = new byte[_buildSize];
for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++) for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++)

4
Ryujinx/Program.cs
View file

@ -151,7 +151,7 @@ namespace Ryujinx
// Initialize SDL2 driver // Initialize SDL2 driver
SDL2Driver.MainThreadDispatcher = action => SDL2Driver.MainThreadDispatcher = action =>
{ {
Gtk.Application.Invoke(delegate Application.Invoke(delegate
{ {
action(); action();
}); });
@ -282,7 +282,7 @@ namespace Ryujinx
? GraphicsBackend.Vulkan ? GraphicsBackend.Vulkan
: GraphicsBackend.OpenGl; : GraphicsBackend.OpenGl;
ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath); ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
} }
Application.Run(); Application.Run();

8
Ryujinx/Ui/RendererWidgetBase.cs
View file

@ -132,7 +132,7 @@ namespace Ryujinx.Ui
private void HideCursorStateChanged(object sender, ReactiveEventArgs<bool> state) private void HideCursorStateChanged(object sender, ReactiveEventArgs<bool> state)
{ {
Gtk.Application.Invoke(delegate Application.Invoke(delegate
{ {
_hideCursorOnIdle = state.NewValue; _hideCursorOnIdle = state.NewValue;
@ -248,7 +248,7 @@ namespace Ryujinx.Ui
&& keyboard.IsPressed(Key.Enter)) && keyboard.IsPressed(Key.Enter))
|| keyboard.IsPressed(Key.Escape); || keyboard.IsPressed(Key.Escape);
bool fullScreenToggled = ParentWindow.State.HasFlag(Gdk.WindowState.Fullscreen); bool fullScreenToggled = ParentWindow.State.HasFlag(WindowState.Fullscreen);
if (toggleFullscreen != _toggleFullscreen) if (toggleFullscreen != _toggleFullscreen)
{ {
@ -340,7 +340,7 @@ namespace Ryujinx.Ui
string directory = AppDataManager.Mode switch string directory = AppDataManager.Mode switch
{ {
AppDataManager.LaunchMode.Portable => System.IO.Path.Combine(AppDataManager.BaseDirPath, "screenshots"), AppDataManager.LaunchMode.Portable => System.IO.Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
_ => System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyPictures), "Ryujinx") _ => System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx")
}; };
string path = System.IO.Path.Combine(directory, filename); string path = System.IO.Path.Combine(directory, filename);
@ -434,7 +434,7 @@ namespace Ryujinx.Ui
if (_ticks >= _ticksPerFrame) if (_ticks >= _ticksPerFrame)
{ {
string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? "Docked" : "Handheld"; string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? "Docked" : "Handheld";
float scale = Graphics.Gpu.GraphicsConfig.ResScale; float scale = GraphicsConfig.ResScale;
if (scale != 1) if (scale != 1)
{ {
dockedMode += $" ({scale}x)"; dockedMode += $" ({scale}x)";