[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
@@ -9,35 +9,35 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
||||
{
|
||||
class BufferQueueCore
|
||||
{
|
||||
public BufferSlotArray Slots;
|
||||
public int OverrideMaxBufferCount;
|
||||
public bool UseAsyncBuffer;
|
||||
public bool DequeueBufferCannotBlock;
|
||||
public PixelFormat DefaultBufferFormat;
|
||||
public int DefaultWidth;
|
||||
public int DefaultHeight;
|
||||
public int DefaultMaxBufferCount;
|
||||
public int MaxAcquiredBufferCount;
|
||||
public bool BufferHasBeenQueued;
|
||||
public ulong FrameCounter;
|
||||
public BufferSlotArray Slots;
|
||||
public int OverrideMaxBufferCount;
|
||||
public bool UseAsyncBuffer;
|
||||
public bool DequeueBufferCannotBlock;
|
||||
public PixelFormat DefaultBufferFormat;
|
||||
public int DefaultWidth;
|
||||
public int DefaultHeight;
|
||||
public int DefaultMaxBufferCount;
|
||||
public int MaxAcquiredBufferCount;
|
||||
public bool BufferHasBeenQueued;
|
||||
public ulong FrameCounter;
|
||||
public NativeWindowTransform TransformHint;
|
||||
public bool IsAbandoned;
|
||||
public NativeWindowApi ConnectedApi;
|
||||
public bool IsAllocating;
|
||||
public IProducerListener ProducerListener;
|
||||
public IConsumerListener ConsumerListener;
|
||||
public bool ConsumerControlledByApp;
|
||||
public uint ConsumerUsageBits;
|
||||
public List<BufferItem> Queue;
|
||||
public BufferInfo[] BufferHistory;
|
||||
public uint BufferHistoryPosition;
|
||||
public bool EnableExternalEvent;
|
||||
public int MaxBufferCountCached;
|
||||
public bool IsAbandoned;
|
||||
public NativeWindowApi ConnectedApi;
|
||||
public bool IsAllocating;
|
||||
public IProducerListener ProducerListener;
|
||||
public IConsumerListener ConsumerListener;
|
||||
public bool ConsumerControlledByApp;
|
||||
public uint ConsumerUsageBits;
|
||||
public List<BufferItem> Queue;
|
||||
public BufferInfo[] BufferHistory;
|
||||
public uint BufferHistoryPosition;
|
||||
public bool EnableExternalEvent;
|
||||
public int MaxBufferCountCached;
|
||||
|
||||
public readonly object Lock = new();
|
||||
|
||||
private KEvent _waitBufferFreeEvent;
|
||||
private KEvent _frameAvailableEvent;
|
||||
private readonly KEvent _waitBufferFreeEvent;
|
||||
private readonly KEvent _frameAvailableEvent;
|
||||
|
||||
public ulong Owner { get; }
|
||||
|
||||
@@ -49,36 +49,36 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
||||
|
||||
public BufferQueueCore(Switch device, ulong pid)
|
||||
{
|
||||
Slots = new BufferSlotArray();
|
||||
IsAbandoned = false;
|
||||
OverrideMaxBufferCount = 0;
|
||||
Slots = new BufferSlotArray();
|
||||
IsAbandoned = false;
|
||||
OverrideMaxBufferCount = 0;
|
||||
DequeueBufferCannotBlock = false;
|
||||
UseAsyncBuffer = false;
|
||||
DefaultWidth = 1;
|
||||
DefaultHeight = 1;
|
||||
DefaultMaxBufferCount = 2;
|
||||
MaxAcquiredBufferCount = 1;
|
||||
FrameCounter = 0;
|
||||
TransformHint = 0;
|
||||
DefaultBufferFormat = PixelFormat.Rgba8888;
|
||||
IsAllocating = false;
|
||||
ProducerListener = null;
|
||||
ConsumerListener = null;
|
||||
ConsumerUsageBits = 0;
|
||||
UseAsyncBuffer = false;
|
||||
DefaultWidth = 1;
|
||||
DefaultHeight = 1;
|
||||
DefaultMaxBufferCount = 2;
|
||||
MaxAcquiredBufferCount = 1;
|
||||
FrameCounter = 0;
|
||||
TransformHint = 0;
|
||||
DefaultBufferFormat = PixelFormat.Rgba8888;
|
||||
IsAllocating = false;
|
||||
ProducerListener = null;
|
||||
ConsumerListener = null;
|
||||
ConsumerUsageBits = 0;
|
||||
|
||||
Queue = new List<BufferItem>();
|
||||
|
||||
// TODO: CreateGraphicBufferAlloc?
|
||||
|
||||
_waitBufferFreeEvent = new KEvent(device.System.KernelContext);
|
||||
_waitBufferFreeEvent = new KEvent(device.System.KernelContext);
|
||||
_frameAvailableEvent = new KEvent(device.System.KernelContext);
|
||||
|
||||
Owner = pid;
|
||||
|
||||
Active = true;
|
||||
|
||||
BufferHistory = new BufferInfo[BufferHistoryArraySize];
|
||||
EnableExternalEvent = true;
|
||||
BufferHistory = new BufferInfo[BufferHistoryArraySize];
|
||||
EnableExternalEvent = true;
|
||||
MaxBufferCountCached = 0;
|
||||
}
|
||||
|
||||
@@ -220,9 +220,9 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
||||
Slots[slot].NeedsCleanupOnRelease = true;
|
||||
}
|
||||
|
||||
Slots[slot].BufferState = BufferState.Free;
|
||||
Slots[slot].FrameNumber = uint.MaxValue;
|
||||
Slots[slot].AcquireCalled = false;
|
||||
Slots[slot].BufferState = BufferState.Free;
|
||||
Slots[slot].FrameNumber = uint.MaxValue;
|
||||
Slots[slot].AcquireCalled = false;
|
||||
Slots[slot].Fence.FenceCount = 0;
|
||||
}
|
||||
|
||||
@@ -259,7 +259,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
||||
return;
|
||||
}
|
||||
|
||||
bool needBufferReleaseSignal = false;
|
||||
bool needBufferReleaseSignal = false;
|
||||
bool needFrameAvailableSignal = false;
|
||||
|
||||
if (maxBufferCount > 1)
|
||||
|
||||
Reference in New Issue
Block a user