From b4eaa5f2629fddbbd4cfe75f5d523d9d5bcf9624 Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Sat, 28 Jun 2025 17:43:11 -0500 Subject: [PATCH] misc: chore: Android: Remove redundant qualifiers --- src/LibKenjinx/LibKenjinx.Graphics.cs | 5 ++-- src/Ryujinx.Common/Logging/Logger.cs | 2 +- src/Ryujinx.Cpu/Nce/NceThreadPal.cs | 7 +++--- .../Signal/UnixSignalHandlerRegistration.cs | 9 ++++--- src/Ryujinx.Graphics.Vulkan/Window.cs | 5 ++-- .../Nifm/StaticService/IGeneralService.cs | 4 +-- .../HOS/Services/Spl/IGeneralInterface.cs | 3 ++- src/Ryujinx.Memory/MemoryBlock.cs | 3 ++- src/Ryujinx.Memory/MemoryManagement.cs | 25 ++++++++++--------- src/Ryujinx.Memory/MemoryManagementUnix.cs | 3 ++- src/Ryujinx.Memory/MemoryManagerUnixHelper.cs | 7 +++--- 11 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/LibKenjinx/LibKenjinx.Graphics.cs b/src/LibKenjinx/LibKenjinx.Graphics.cs index 47a1cd094..b0de384d1 100644 --- a/src/LibKenjinx/LibKenjinx.Graphics.cs +++ b/src/LibKenjinx/LibKenjinx.Graphics.cs @@ -1,4 +1,5 @@ using LibKenjinx.Android; +using Ryujinx.Common; using Ryujinx.Common.Configuration; using Ryujinx.Cpu; using Ryujinx.Graphics.GAL; @@ -113,7 +114,7 @@ namespace LibKenjinx _isActive = true; - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { setRenderingThread(); } @@ -164,7 +165,7 @@ namespace LibKenjinx { void SetInfo(string status, float value) { - if(Ryujinx.Common.PlatformInfo.IsBionic) + if(PlatformInfo.IsBionic) { Interop.UpdateProgress(status, value); } diff --git a/src/Ryujinx.Common/Logging/Logger.cs b/src/Ryujinx.Common/Logging/Logger.cs index 7c6613854..ceaa4ddba 100644 --- a/src/Ryujinx.Common/Logging/Logger.cs +++ b/src/Ryujinx.Common/Logging/Logger.cs @@ -136,7 +136,7 @@ namespace Ryujinx.Common.Logging _time = Stopwatch.StartNew(); - if (!Ryujinx.Common.PlatformInfo.IsBionic) + if (!PlatformInfo.IsBionic) { // Logger should log to console by default AddTarget(new AsyncLogTargetWrapper( diff --git a/src/Ryujinx.Cpu/Nce/NceThreadPal.cs b/src/Ryujinx.Cpu/Nce/NceThreadPal.cs index 725c32022..89b486c93 100644 --- a/src/Ryujinx.Cpu/Nce/NceThreadPal.cs +++ b/src/Ryujinx.Cpu/Nce/NceThreadPal.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using System; namespace Ryujinx.Cpu.Nce @@ -11,7 +12,7 @@ namespace Ryujinx.Cpu.Nce public static IntPtr GetCurrentThreadHandle() { - if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Ryujinx.Common.PlatformInfo.IsBionic) + if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return NceThreadPalUnix.GetCurrentThreadHandle(); } @@ -23,7 +24,7 @@ namespace Ryujinx.Cpu.Nce public static void SuspendThread(IntPtr handle) { - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { NceThreadPalAndroid.SuspendThread(handle); } @@ -37,4 +38,4 @@ namespace Ryujinx.Cpu.Nce } } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Cpu/Signal/UnixSignalHandlerRegistration.cs b/src/Ryujinx.Cpu/Signal/UnixSignalHandlerRegistration.cs index 1b6519605..caccefb4e 100644 --- a/src/Ryujinx.Cpu/Signal/UnixSignalHandlerRegistration.cs +++ b/src/Ryujinx.Cpu/Signal/UnixSignalHandlerRegistration.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; @@ -70,7 +71,7 @@ namespace Ryujinx.Cpu.Signal int result; SigAction old; - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { result = sigaction(SIGSEGV, IntPtr.Zero, out SigActionBionic tmp); @@ -100,7 +101,7 @@ namespace Ryujinx.Cpu.Signal int result; SigAction old; - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { SigActionBionic sig = new() { @@ -187,7 +188,7 @@ namespace Ryujinx.Cpu.Signal { int result; - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { SigActionBionic sig = new() { @@ -235,7 +236,7 @@ namespace Ryujinx.Cpu.Signal public static bool RestoreExceptionHandler(SigAction oldAction) { - if (Ryujinx.Common.PlatformInfo.IsBionic) + if (PlatformInfo.IsBionic) { SigActionBionic tmp = new SigActionBionic { diff --git a/src/Ryujinx.Graphics.Vulkan/Window.cs b/src/Ryujinx.Graphics.Vulkan/Window.cs index 2b2e509c6..b3871ec09 100644 --- a/src/Ryujinx.Graphics.Vulkan/Window.cs +++ b/src/Ryujinx.Graphics.Vulkan/Window.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.Vulkan.Effects; using Silk.NET.Vulkan; @@ -142,10 +143,10 @@ namespace Ryujinx.Graphics.Vulkan ImageFormat = surfaceFormat.Format, ImageColorSpace = surfaceFormat.ColorSpace, ImageExtent = extent, - ImageUsage = ImageUsageFlags.ColorAttachmentBit | ImageUsageFlags.TransferDstBit | (Ryujinx.Common.PlatformInfo.IsBionic ? 0 : ImageUsageFlags.StorageBit), + ImageUsage = ImageUsageFlags.ColorAttachmentBit | ImageUsageFlags.TransferDstBit | (PlatformInfo.IsBionic ? 0 : ImageUsageFlags.StorageBit), ImageSharingMode = SharingMode.Exclusive, ImageArrayLayers = 1, - PreTransform = Ryujinx.Common.PlatformInfo.IsBionic ? SurfaceTransformFlagsKHR.IdentityBitKhr : capabilities.CurrentTransform, + PreTransform = PlatformInfo.IsBionic ? SurfaceTransformFlagsKHR.IdentityBitKhr : capabilities.CurrentTransform, CompositeAlpha = ChooseCompositeAlpha(capabilities.SupportedCompositeAlpha), PresentMode = ChooseSwapPresentMode(presentModes, _vSyncMode), Clipped = true, diff --git a/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs b/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs index 697f872b7..5c4c7bf9c 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request? }; - if (!Ryujinx.Common.PlatformInfo.IsBionic) + if (!PlatformInfo.IsBionic) { NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler; } @@ -199,7 +199,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService { if (isDisposing) { - if (!Ryujinx.Common.PlatformInfo.IsBionic) + if (!PlatformInfo.IsBionic) { NetworkChange.NetworkAddressChanged -= LocalInterfaceCacheHandler; } diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs index b91230168..b21437f8e 100644 --- a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs +++ b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Services.Spl.Types; @@ -51,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl context.ResponseData.Write(configValue); - if(Ryujinx.Common.PlatformInfo.IsBionic) + if(PlatformInfo.IsBionic) { if (result == SmcResult.Success) { diff --git a/src/Ryujinx.Memory/MemoryBlock.cs b/src/Ryujinx.Memory/MemoryBlock.cs index 56023b6f6..757722639 100644 --- a/src/Ryujinx.Memory/MemoryBlock.cs +++ b/src/Ryujinx.Memory/MemoryBlock.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using System; using System.Runtime.CompilerServices; using System.Threading; @@ -426,7 +427,7 @@ namespace Ryujinx.Memory return OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134); } - return OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic; + return OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic; } return true; diff --git a/src/Ryujinx.Memory/MemoryManagement.cs b/src/Ryujinx.Memory/MemoryManagement.cs index a6381125b..6e49162b9 100644 --- a/src/Ryujinx.Memory/MemoryManagement.cs +++ b/src/Ryujinx.Memory/MemoryManagement.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using System; using System.Diagnostics.CodeAnalysis; @@ -12,7 +13,7 @@ namespace Ryujinx.Memory { return MemoryManagementWindows.Allocate((IntPtr)size); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return MemoryManagementUnix.Allocate(size, forJit); } @@ -28,7 +29,7 @@ namespace Ryujinx.Memory { return MemoryManagementWindows.Reserve((IntPtr)size, viewCompatible); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return MemoryManagementUnix.Reserve(size, forJit); } @@ -44,7 +45,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.Commit(address, (IntPtr)size); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.Commit(address, size, forJit); } @@ -60,7 +61,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.Decommit(address, (IntPtr)size); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.Decommit(address, size); } @@ -76,7 +77,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.MapView(sharedMemory, srcOffset, address, (IntPtr)size, owner); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.MapView(sharedMemory, srcOffset, address, size); } @@ -92,7 +93,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.UnmapView(sharedMemory, address, (IntPtr)size, owner); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.UnmapView(address, size); } @@ -110,7 +111,7 @@ namespace Ryujinx.Memory { result = MemoryManagementWindows.Reprotect(address, (IntPtr)size, permission, forView); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { result = MemoryManagementUnix.Reprotect(address, size, permission); } @@ -131,7 +132,7 @@ namespace Ryujinx.Memory { return MemoryManagementWindows.Free(address, (IntPtr)size); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return MemoryManagementUnix.Free(address); } @@ -147,7 +148,7 @@ namespace Ryujinx.Memory { return MemoryManagementWindows.CreateSharedMemory((IntPtr)size, reserve); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return MemoryManagementUnix.CreateSharedMemory(size, reserve); } @@ -163,7 +164,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.DestroySharedMemory(handle); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.DestroySharedMemory(handle); } @@ -179,7 +180,7 @@ namespace Ryujinx.Memory { return MemoryManagementWindows.MapSharedMemory(handle); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { return MemoryManagementUnix.MapSharedMemory(handle, size); } @@ -195,7 +196,7 @@ namespace Ryujinx.Memory { MemoryManagementWindows.UnmapSharedMemory(address); } - else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Common.PlatformInfo.IsBionic) + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || PlatformInfo.IsBionic) { MemoryManagementUnix.UnmapSharedMemory(address, size); } diff --git a/src/Ryujinx.Memory/MemoryManagementUnix.cs b/src/Ryujinx.Memory/MemoryManagementUnix.cs index 15f80d1de..1a7061026 100644 --- a/src/Ryujinx.Memory/MemoryManagementUnix.cs +++ b/src/Ryujinx.Memory/MemoryManagementUnix.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using Ryujinx.Common.Logging; using System; using System.Collections.Concurrent; @@ -160,7 +161,7 @@ namespace Ryujinx.Memory } } } - else if (Ryujinx.Common.PlatformInfo.IsBionic) + else if (PlatformInfo.IsBionic) { byte[] memName = "Ryujinx-XXXXXX"u8.ToArray(); diff --git a/src/Ryujinx.Memory/MemoryManagerUnixHelper.cs b/src/Ryujinx.Memory/MemoryManagerUnixHelper.cs index 8bed0d2db..e3ec6dece 100644 --- a/src/Ryujinx.Memory/MemoryManagerUnixHelper.cs +++ b/src/Ryujinx.Memory/MemoryManagerUnixHelper.cs @@ -1,3 +1,4 @@ +using Ryujinx.Common; using System; using System.Runtime.InteropServices; using System.Runtime.Versioning; @@ -113,7 +114,7 @@ namespace Ryujinx.Memory if (flags.HasFlag(MmapFlags.MAP_ANONYMOUS)) { - if (OperatingSystem.IsLinux() || Common.PlatformInfo.IsBionic) + if (OperatingSystem.IsLinux() || PlatformInfo.IsBionic) { result |= MAP_ANONYMOUS_LINUX_GENERIC; } @@ -129,7 +130,7 @@ namespace Ryujinx.Memory if (flags.HasFlag(MmapFlags.MAP_NORESERVE)) { - if (OperatingSystem.IsLinux() || Common.PlatformInfo.IsBionic) + if (OperatingSystem.IsLinux() || PlatformInfo.IsBionic) { result |= MAP_NORESERVE_LINUX_GENERIC; } @@ -145,7 +146,7 @@ namespace Ryujinx.Memory if (flags.HasFlag(MmapFlags.MAP_UNLOCKED)) { - if (OperatingSystem.IsLinux() || Common.PlatformInfo.IsBionic) + if (OperatingSystem.IsLinux() || PlatformInfo.IsBionic) { result |= MAP_UNLOCKED_LINUX_GENERIC; }