Просмотр исходного кода

Prefer generic overload when type is known (#430)

Marco Carvalho 1 год назад
Родитель
Сommit
b5483d8fe0

+ 1 - 1
src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs

@@ -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];

+ 1 - 1
src/Ryujinx.Graphics.Vulkan/FormatTable.cs

@@ -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

+ 1 - 1
src/Ryujinx.Graphics.Vulkan/Queries/Counters.cs

@@ -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];
 
 

+ 6 - 6
src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -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))
-                .Select(command => (((CommandCmifAttribute)command).Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
+                .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))
-                .Select(command => (((CommandTipcAttribute)command).Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
+                .Select(command => (command.Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
                 .ToDictionary(command => command.Id, command => command.methodInfo);
 
 
             Server = server;
             Server = server;

+ 1 - 1
src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -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);

+ 1 - 1
src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -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);
 
 

+ 2 - 2
src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -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;
 
 

+ 1 - 1
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -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();