vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ryujinx.Graphics.Vulkan] Address dotnet-format issues (#5378)

Browse Source 
* 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 IDE0059 warnings

* Address dotnet format CA1816 warnings

* Fix new dotnet-format issues after rebase

* 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

* Format if-blocks correctly

* Another rebase, another dotnet format run

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format style after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Run dotnet format after rebase

* 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

* Remove redundant code

* Rename generics

* Address review feedback

* Remove SetOrigin
This commit is contained in:
TSRBerry
2023-07-01 12:31:42 +02:00
committed by GitHub
parent 12c5f6ee89
commit 801b71a128
72 changed files with 1134 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Ryujinx.Graphics.Vulkan/CacheByRange.cs
View File

@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = null;
}
public bool KeyEqual(ICacheKey other)
public readonly bool KeyEqual(ICacheKey other)
{
return other is I8ToI16CacheKey;
}
@ -30,7 +30,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = buffer;
}
public void Dispose()
public readonly void Dispose()
{
_gd.PipelineInternal.DirtyIndexBuffer(_buffer);
}
@ -53,7 +53,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = null;
}
public bool KeyEqual(ICacheKey other)
public readonly bool KeyEqual(ICacheKey other)
{
return other is AlignedVertexBufferCacheKey entry &&
entry._stride == _stride &&
@ -65,7 +65,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = buffer;
}
public void Dispose()
public readonly void Dispose()
{
_gd.PipelineInternal.DirtyVertexBuffer(_buffer);
}
@ -73,8 +73,8 @@ namespace Ryujinx.Graphics.Vulkan
struct TopologyConversionCacheKey : ICacheKey
{
private IndexBufferPattern _pattern;
private int _indexSize;
private readonly IndexBufferPattern _pattern;
private readonly int _indexSize;
// Used to notify the pipeline that bindings have invalidated on dispose.
private readonly VulkanRenderer _gd;
@ -88,7 +88,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = null;
}
public bool KeyEqual(ICacheKey other)
public readonly bool KeyEqual(ICacheKey other)
{
return other is TopologyConversionCacheKey entry &&
entry._pattern == _pattern &&
@ -100,7 +100,7 @@ namespace Ryujinx.Graphics.Vulkan
_buffer = buffer;
}
public void Dispose()
public readonly void Dispose()
{
_gd.PipelineInternal.DirtyIndexBuffer(_buffer);
}
@ -147,9 +147,9 @@ namespace Ryujinx.Graphics.Vulkan
}
}
struct IndirectDataCacheKey : ICacheKey
readonly struct IndirectDataCacheKey : ICacheKey
{
private IndexBufferPattern _pattern;
private readonly IndexBufferPattern _pattern;
public IndirectDataCacheKey(IndexBufferPattern pattern)
{
@ -168,12 +168,12 @@ namespace Ryujinx.Graphics.Vulkan
struct DrawCountCacheKey : ICacheKey
{
public bool KeyEqual(ICacheKey other)
public readonly bool KeyEqual(ICacheKey other)
{
return other is DrawCountCacheKey;
}
public void Dispose()
public readonly void Dispose()
{
}
}
@ -214,7 +214,7 @@ namespace Ryujinx.Graphics.Vulkan
DependencyList = null;
}
public void InvalidateDependencies()
public readonly void InvalidateDependencies()
{
if (DependencyList != null)
{
@ -317,7 +317,7 @@ namespace Ryujinx.Graphics.Vulkan
}
}
public void ClearRange(int offset, int size)
public readonly void ClearRange(int offset, int size)
{
if (_ranges != null && _ranges.Count > 0)
{
@ -356,15 +356,11 @@ namespace Ryujinx.Graphics.Vulkan
private List<Entry> GetEntries(int offset, int size)
{
if (_ranges == null)
{
_ranges = new Dictionary<ulong, List<Entry>>();
}
_ranges ??= new Dictionary<ulong, List<Entry>>();
ulong key = PackRange(offset, size);
List<Entry> value;
if (!_ranges.TryGetValue(key, out value))
if (!_ranges.TryGetValue(key, out List<Entry> value))
{
value = new List<Entry>();
_ranges.Add(key, value);