aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Graphics.GAL/Multithreading/Resources
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-06-28 20:20:10 +0200
committerGitHub <noreply@github.com>2023-06-28 20:20:10 +0200
commit7c989f88bdab65dfa7783e824a180220ba829bd0 (patch)
tree57ca5fa398d1fc2d97f7f1e14fcf74cfb6907fc3 /src/Ryujinx.Graphics.GAL/Multithreading/Resources
parent16fa98370472f843ebdae5addbb00e26899ebe55 (diff)
[Ryujinx.Graphics.GAL] Address dotnet-format issues (#5366)
* 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 IDE0052 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA1069 warnings * Address remaining dotnet format analyzer warnings * Address review comments * 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 * Revert formatting changes for while and for-loops * 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 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 * Start working on disabled warnings * Address IDE0251 warnings * 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 * Address review feedback * Add trailing commas * Remove SuppressMessage for IDE0066 * Make explicit Equals implementation implicit
Diffstat (limited to 'src/Ryujinx.Graphics.GAL/Multithreading/Resources')
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs6
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs4
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs2
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs2
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs6
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs2
-rw-r--r--src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs11
7 files changed, 16 insertions, 17 deletions
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs
index 3f982d31..87ab2f1b 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ProgramQueue.cs
@@ -12,10 +12,10 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
private const int MaxConcurrentCompilations = 8;
- private IRenderer _renderer;
+ private readonly IRenderer _renderer;
- private Queue<IProgramRequest> _toCompile;
- private List<ThreadedProgram> _inProgress;
+ private readonly Queue<IProgramRequest> _toCompile;
+ private readonly List<ThreadedProgram> _inProgress;
public ProgramQueue(IRenderer renderer)
{
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs
index b4c6853f..e4df1c1b 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/BinaryProgramRequest.cs
@@ -4,8 +4,8 @@
{
public ThreadedProgram Threaded { get; set; }
- private byte[] _data;
- private bool _hasFragmentShader;
+ private readonly byte[] _data;
+ private readonly bool _hasFragmentShader;
private ShaderInfo _info;
public BinaryProgramRequest(ThreadedProgram program, byte[] data, bool hasFragmentShader, ShaderInfo info)
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs
index ff06abb1..744b77e1 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs
@@ -4,7 +4,7 @@
{
public ThreadedProgram Threaded { get; set; }
- private ShaderSource[] _shaders;
+ private readonly ShaderSource[] _shaders;
private ShaderInfo _info;
public SourceProgramRequest(ThreadedProgram program, ShaderSource[] shaders, ShaderInfo info)
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs
index 4b7471d6..e4e197eb 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedCounterEvent.cs
@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
class ThreadedCounterEvent : ICounterEvent
{
- private ThreadedRenderer _renderer;
+ private readonly ThreadedRenderer _renderer;
public ICounterEvent Base;
public bool Invalid { get; set; }
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs
index 068d058e..7cbbce45 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedProgram.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
class ThreadedProgram : IProgram
{
- private ThreadedRenderer _renderer;
+ private readonly ThreadedRenderer _renderer;
public IProgram Base;
@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
public byte[] GetBinary()
{
- ResultBox<byte[]> box = new ResultBox<byte[]>();
+ ResultBox<byte[]> box = new();
_renderer.New<ProgramGetBinaryCommand>().Set(Ref(this), Ref(box));
_renderer.InvokeCommand();
@@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
public ProgramLinkStatus CheckProgramLink(bool blocking)
{
- ResultBox<ProgramLinkStatus> box = new ResultBox<ProgramLinkStatus>();
+ ResultBox<ProgramLinkStatus> box = new();
_renderer.New<ProgramCheckLinkCommand>().Set(Ref(this), blocking, Ref(box));
_renderer.InvokeCommand();
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs
index d8de9a70..62e628a7 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedSampler.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
class ThreadedSampler : ISampler
{
- private ThreadedRenderer _renderer;
+ private readonly ThreadedRenderer _renderer;
public ISampler Base;
public ThreadedSampler(ThreadedRenderer renderer)
diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
index bb0b05fb..b82e286a 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTexture.cs
@@ -1,7 +1,6 @@
using Ryujinx.Common.Memory;
using Ryujinx.Graphics.GAL.Multithreading.Commands.Texture;
using Ryujinx.Graphics.GAL.Multithreading.Model;
-using System;
namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
@@ -10,8 +9,8 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
/// </summary>
class ThreadedTexture : ITexture
{
- private ThreadedRenderer _renderer;
- private TextureCreateInfo _info;
+ private readonly ThreadedRenderer _renderer;
+ private readonly TextureCreateInfo _info;
public ITexture Base;
public int Width => _info.Width;
@@ -65,7 +64,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel)
{
- ThreadedTexture newTex = new ThreadedTexture(_renderer, info, ScaleFactor);
+ ThreadedTexture newTex = new(_renderer, info, ScaleFactor);
_renderer.New<TextureCreateViewCommand>().Set(Ref(this), Ref(newTex), info, firstLayer, firstLevel);
_renderer.QueueCommand();
@@ -76,7 +75,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
if (_renderer.IsGpuThread())
{
- ResultBox<PinnedSpan<byte>> box = new ResultBox<PinnedSpan<byte>>();
+ ResultBox<PinnedSpan<byte>> box = new();
_renderer.New<TextureGetDataCommand>().Set(Ref(this), Ref(box));
_renderer.InvokeCommand();
@@ -94,7 +93,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
{
if (_renderer.IsGpuThread())
{
- ResultBox<PinnedSpan<byte>> box = new ResultBox<PinnedSpan<byte>>();
+ ResultBox<PinnedSpan<byte>> box = new();
_renderer.New<TextureGetDataSliceCommand>().Set(Ref(this), Ref(box), layer, level);
_renderer.InvokeCommand();