mirror of
https://git.743378673.xyz/MeloNX/MeloNX.git
synced 2025-07-28 17:37:11 +02:00
[Ryujinx.HLE] Address dotnet-format issues (#5380)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
This commit is contained in:
TSRBerry
GitHub
parent
fec8291c17
commit
326749498b
1015 changed files with 8173 additions and 7615 deletions
|
|
@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
{
|
||||
private readonly byte[] _rawData;
|
||||
|
||||
private Span<byte> Raw => new Span<byte>(_rawData);
|
||||
private Span<byte> Raw => new(_rawData);
|
||||
|
||||
private ref ParcelHeader Header => ref MemoryMarshal.Cast<byte, ParcelHeader>(_rawData)[0];
|
||||
|
||||
|
|
@ -26,10 +26,10 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
|
||||
public Parcel(byte[] rawData)
|
||||
{
|
||||
_rawData = rawData;
|
||||
_rawData = rawData;
|
||||
|
||||
_payloadPosition = 0;
|
||||
_objectPosition = 0;
|
||||
_objectPosition = 0;
|
||||
}
|
||||
|
||||
public Parcel(uint payloadSize, uint objectsSize)
|
||||
|
|
@ -38,16 +38,18 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
|
||||
_rawData = new byte[BitUtils.AlignUp<uint>(headerSize + payloadSize + objectsSize, 4)];
|
||||
|
||||
Header.PayloadSize = payloadSize;
|
||||
Header.ObjectsSize = objectsSize;
|
||||
Header.PayloadSize = payloadSize;
|
||||
Header.ObjectsSize = objectsSize;
|
||||
Header.PayloadOffset = headerSize;
|
||||
Header.ObjectOffset = Header.PayloadOffset + Header.ObjectsSize;
|
||||
Header.ObjectOffset = Header.PayloadOffset + Header.ObjectsSize;
|
||||
}
|
||||
|
||||
public string ReadInterfaceToken()
|
||||
{
|
||||
// Ignore the policy flags
|
||||
#pragma warning disable IDE0059 // Remove unnecessary value assignment
|
||||
int strictPolicy = ReadInt32();
|
||||
#pragma warning restore IDE0059
|
||||
|
||||
return ReadString16();
|
||||
}
|
||||
|
|
@ -64,7 +66,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
ReadOnlySpan<byte> data = ReadInPlace((size + 1) * 2);
|
||||
|
||||
// Return the unicode string without the last character (null terminator)
|
||||
return Encoding.Unicode.GetString(data.Slice(0, size * 2));
|
||||
return Encoding.Unicode.GetString(data[..(size * 2)]);
|
||||
}
|
||||
|
||||
public int ReadInt32() => ReadUnmanagedType<int>();
|
||||
|
|
@ -77,7 +79,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
{
|
||||
long flattenableSize = ReadInt64();
|
||||
|
||||
T result = new T();
|
||||
T result = new();
|
||||
|
||||
Debug.Assert(flattenableSize == result.GetFlattenedSize());
|
||||
|
||||
|
|
@ -86,7 +88,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
return result;
|
||||
}
|
||||
|
||||
public T ReadUnmanagedType<T>() where T: unmanaged
|
||||
public T ReadUnmanagedType<T>() where T : unmanaged
|
||||
{
|
||||
ReadOnlySpan<byte> data = ReadInPlace(Unsafe.SizeOf<T>());
|
||||
|
||||
|
|
@ -105,8 +107,8 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
[StructLayout(LayoutKind.Sequential, Size = 0x28)]
|
||||
private struct FlatBinderObject
|
||||
{
|
||||
public int Type;
|
||||
public int Flags;
|
||||
public int Type;
|
||||
public int Flags;
|
||||
public long BinderId;
|
||||
public long Cookie;
|
||||
|
||||
|
|
@ -115,12 +117,12 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
public Span<byte> ServiceName => MemoryMarshal.CreateSpan(ref _serviceNameStart, 0x8);
|
||||
}
|
||||
|
||||
public void WriteObject<T>(T obj, string serviceName) where T: IBinder
|
||||
public void WriteObject<T>(T obj, string serviceName) where T : IBinder
|
||||
{
|
||||
FlatBinderObject flatBinderObject = new FlatBinderObject
|
||||
FlatBinderObject flatBinderObject = new()
|
||||
{
|
||||
Type = 2,
|
||||
Flags = 0,
|
||||
Type = 2,
|
||||
Flags = 0,
|
||||
BinderId = HOSBinderDriverServer.GetBinderId(obj),
|
||||
};
|
||||
|
||||
|
|
@ -149,7 +151,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
}
|
||||
}
|
||||
|
||||
public void WriteStrongPointer<T>(ref AndroidStrongPointer<T> value) where T: unmanaged, IFlattenable
|
||||
public void WriteStrongPointer<T>(ref AndroidStrongPointer<T> value) where T : unmanaged, IFlattenable
|
||||
{
|
||||
WriteBoolean(!value.IsNull);
|
||||
|
||||
|
|
@ -205,17 +207,17 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|||
{
|
||||
uint headerSize = (uint)Unsafe.SizeOf<ParcelHeader>();
|
||||
|
||||
Header.PayloadSize = (uint)_payloadPosition;
|
||||
Header.ObjectsSize = (uint)_objectPosition;
|
||||
Header.PayloadSize = (uint)_payloadPosition;
|
||||
Header.ObjectsSize = (uint)_objectPosition;
|
||||
Header.PayloadOffset = headerSize;
|
||||
Header.ObjectOffset = Header.PayloadOffset + Header.PayloadSize;
|
||||
Header.ObjectOffset = Header.PayloadOffset + Header.PayloadSize;
|
||||
}
|
||||
|
||||
public ReadOnlySpan<byte> Finish()
|
||||
{
|
||||
UpdateHeader();
|
||||
|
||||
return Raw.Slice(0, (int)(Header.PayloadSize + Header.ObjectsSize + Unsafe.SizeOf<ParcelHeader>()));
|
||||
return Raw[..(int)(Header.PayloadSize + Header.ObjectsSize + Unsafe.SizeOf<ParcelHeader>())];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue