aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristallix <Cristallix@users.noreply.github.com>2020-04-20 23:59:59 +0200
committerGitHub <noreply@github.com>2020-04-21 07:59:59 +1000
commit4738113f293ac2477a553225a24b6c489c6855f1 (patch)
tree1878f27da3cc7e73171c7d905447f1eb9f25cefc
parent91fa1debd4c5791a12733d75d7ce06a23a1547ff (diff)
Suppress warnings from fields never used or never assigned (CS0169 and CS0649) (#919)
* chore : disable unwanted warnings and minor code cleanup * chore : remove more warnings * fix : reorder struct correctly * fix : restore _isKernel and remove useless comment * fix : copy/paste error * fix : restore CallMethod call * fix : whitespace * chore : clean using * feat : remove warnings * fix : simplify warning removal on struct * fix : revert fields deletion and code clean up * fix : re-add RE value * fix : typo
-rw-r--r--ARMeilleure/Diagnostics/Logger.cs2
-rw-r--r--ARMeilleure/Statistics.cs2
-rw-r--r--Ryujinx.Debugger/Profiler/Profile.cs2
-rw-r--r--Ryujinx.Debugger/UI/DebuggerWidget.cs2
-rw-r--r--Ryujinx.Debugger/UI/ProfilerWidget.cs4
-rw-r--r--Ryujinx.Graphics.Gpu/DmaPusher.cs8
-rw-r--r--Ryujinx.Graphics.Gpu/Engine/Methods.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/BlendState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/Boolean32.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ClearColors.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ConditionState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyRegion.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyTexture.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/DepthBiasState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/FaceState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/GpuVa.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/IndexBufferState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/MemoryLayout.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/PoolState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ReportState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/RtColorMask.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/RtColorState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/RtControl.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ScissorState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ShaderState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/Size3D.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/StencilTestState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/UniformBufferState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/VertexAttribState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/VertexBufferState.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ViewportExtents.cs2
-rw-r--r--Ryujinx.Graphics.Gpu/State/ViewportTransform.cs2
-rw-r--r--Ryujinx.HLE/HOS/Horizon.cs2
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs4
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs3
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs1
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs2
-rw-r--r--Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs2
-rw-r--r--Ryujinx.HLE/Switch.cs2
-rw-r--r--Ryujinx.HLE/Utilities/FontUtils.cs2
-rw-r--r--Ryujinx/Ui/MainWindow.cs15
65 files changed, 127 insertions, 28 deletions
diff --git a/ARMeilleure/Diagnostics/Logger.cs b/ARMeilleure/Diagnostics/Logger.cs
index 29d9c79b..e7a0ba5c 100644
--- a/ARMeilleure/Diagnostics/Logger.cs
+++ b/ARMeilleure/Diagnostics/Logger.cs
@@ -6,9 +6,11 @@ namespace ARMeilleure.Diagnostics
{
static class Logger
{
+#pragma warning disable CS0169
private static long _startTime;
private static long[] _accumulatedTime;
+#pragma warning restore CS0196
static Logger()
{
diff --git a/ARMeilleure/Statistics.cs b/ARMeilleure/Statistics.cs
index e80ee59d..fbc64708 100644
--- a/ARMeilleure/Statistics.cs
+++ b/ARMeilleure/Statistics.cs
@@ -11,8 +11,10 @@ namespace ARMeilleure
{
private const int ReportMaxFunctions = 100;
+#pragma warning disable CS0169
[ThreadStatic]
private static Stopwatch _executionTimer;
+#pragma warning restore CS0169
private static ConcurrentDictionary<ulong, long> _ticksPerFunction;
diff --git a/Ryujinx.Debugger/Profiler/Profile.cs b/Ryujinx.Debugger/Profiler/Profile.cs
index 862aa845..1be638da 100644
--- a/Ryujinx.Debugger/Profiler/Profile.cs
+++ b/Ryujinx.Debugger/Profiler/Profile.cs
@@ -11,7 +11,9 @@ namespace Ryujinx.Debugger.Profiler
public static float UpdateRate => _settings.UpdateRate;
public static long HistoryLength => _settings.History;
+#pragma warning disable CS0649
private static InternalProfile _profileInstance;
+#pragma warning restore CS0649
private static ProfilerSettings _settings;
[Conditional("USE_DEBUGGING")]
diff --git a/Ryujinx.Debugger/UI/DebuggerWidget.cs b/Ryujinx.Debugger/UI/DebuggerWidget.cs
index b2d8458d..1eb45735 100644
--- a/Ryujinx.Debugger/UI/DebuggerWidget.cs
+++ b/Ryujinx.Debugger/UI/DebuggerWidget.cs
@@ -9,7 +9,9 @@ namespace Ryujinx.Debugger.UI
public event EventHandler DebuggerEnabled;
public event EventHandler DebuggerDisabled;
+#pragma warning disable CS0649
[GUI] Notebook _widgetNotebook;
+#pragma warning restore CS0649
public DebuggerWidget() : this(new Builder("Ryujinx.Debugger.UI.DebuggerWidget.glade")) { }
diff --git a/Ryujinx.Debugger/UI/ProfilerWidget.cs b/Ryujinx.Debugger/UI/ProfilerWidget.cs
index b14c8922..84dff5de 100644
--- a/Ryujinx.Debugger/UI/ProfilerWidget.cs
+++ b/Ryujinx.Debugger/UI/ProfilerWidget.cs
@@ -81,6 +81,7 @@ namespace Ryujinx.Debugger.UI
private SkRenderer _renderer;
+#pragma warning disable CS0649
[GUI] ScrolledWindow _scrollview;
[GUI] CheckButton _enableCheckbutton;
[GUI] Scrollbar _outputScrollbar;
@@ -90,6 +91,7 @@ namespace Ryujinx.Debugger.UI
[GUI] CheckButton _showInactive;
[GUI] Button _stepButton;
[GUI] CheckButton _pauseCheckbutton;
+#pragma warning restore CS0649
public ProfilerWidget() : this(new Builder("Ryujinx.Debugger.UI.ProfilerWidget.glade")) { }
@@ -287,7 +289,7 @@ namespace Ryujinx.Debugger.UI
_sortedProfileData = _sortedProfileData.Where((pair => filterRegex.IsMatch(pair.Key.Search))).ToList();
}
}
- catch (ArgumentException argException)
+ catch (ArgumentException)
{
// Skip filtering for invalid regex
}
diff --git a/Ryujinx.Graphics.Gpu/DmaPusher.cs b/Ryujinx.Graphics.Gpu/DmaPusher.cs
index 33108c31..6d53e42c 100644
--- a/Ryujinx.Graphics.Gpu/DmaPusher.cs
+++ b/Ryujinx.Graphics.Gpu/DmaPusher.cs
@@ -81,9 +81,6 @@ namespace Ryujinx.Graphics.Gpu
private DmaState _state;
- private bool _sliEnable;
- private bool _sliActive;
-
private bool _ibEnable;
private GpuContext _context;
@@ -217,10 +214,7 @@ namespace Ryujinx.Graphics.Gpu
}
else if (_state.MethodCount != 0)
{
- if (!_sliEnable || _sliActive)
- {
- CallMethod(word);
- }
+ CallMethod(word);
if (!_state.NonIncrementing)
{
diff --git a/Ryujinx.Graphics.Gpu/Engine/Methods.cs b/Ryujinx.Graphics.Gpu/Engine/Methods.cs
index bbfbf760..39a902e8 100644
--- a/Ryujinx.Graphics.Gpu/Engine/Methods.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/Methods.cs
@@ -790,10 +790,12 @@ namespace Ryujinx.Graphics.Gpu.Engine
/// </summary>
private struct SbDescriptor
{
+#pragma warning disable CS0649
public uint AddressLow;
public uint AddressHigh;
public int Size;
public int Padding;
+#pragma warning restore CS0649
public ulong PackAddress()
{
diff --git a/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs b/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs
index 77af1ce0..9f5a847b 100644
--- a/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs
+++ b/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs
@@ -51,6 +51,7 @@ namespace Ryujinx.Graphics.Gpu.Image
private const float Frac8ToF32 = 1.0f / 256.0f;
+#pragma warning disable CS0649
public uint Word0;
public uint Word1;
public uint Word2;
@@ -59,6 +60,7 @@ namespace Ryujinx.Graphics.Gpu.Image
public float BorderColorG;
public float BorderColorB;
public float BorderColorA;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks the texture wrap mode along the X axis.
diff --git a/Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs b/Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs
index aebf4abf..313b8e20 100644
--- a/Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.Image
/// </summary>
struct TextureDescriptor
{
+#pragma warning disable CS0649
public uint Word0;
public uint Word1;
public uint Word2;
@@ -13,6 +14,7 @@ namespace Ryujinx.Graphics.Gpu.Image
public uint Word5;
public uint Word6;
public uint Word7;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks Maxwell texture format integer.
diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs
index 76ea3248..39bf10fa 100644
--- a/Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs
+++ b/Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs
@@ -7,12 +7,14 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// </summary>
struct ShaderAddresses : IEquatable<ShaderAddresses>
{
+#pragma warning disable CS0649
public ulong VertexA;
public ulong Vertex;
public ulong TessControl;
public ulong TessEvaluation;
public ulong Geometry;
public ulong Fragment;
+#pragma warning restore CS0649
/// <summary>
/// Check if the addresses are equal.
diff --git a/Ryujinx.Graphics.Gpu/State/BlendState.cs b/Ryujinx.Graphics.Gpu/State/BlendState.cs
index 609bcc29..c4d5a064 100644
--- a/Ryujinx.Graphics.Gpu/State/BlendState.cs
+++ b/Ryujinx.Graphics.Gpu/State/BlendState.cs
@@ -7,6 +7,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct BlendState
{
+#pragma warning disable CS0649
public Boolean32 SeparateAlpha;
public BlendOp ColorOp;
public BlendFactor ColorSrcFactor;
@@ -15,5 +16,6 @@ namespace Ryujinx.Graphics.Gpu.State
public BlendFactor AlphaSrcFactor;
public BlendFactor AlphaDstFactor;
public uint Padding;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs b/Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs
index a11cd5b1..cbb1880b 100644
--- a/Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs
+++ b/Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs
@@ -7,6 +7,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct BlendStateCommon
{
+#pragma warning disable CS0649
public Boolean32 SeparateAlpha;
public BlendOp ColorOp;
public BlendFactor ColorSrcFactor;
@@ -15,5 +16,6 @@ namespace Ryujinx.Graphics.Gpu.State
public BlendFactor AlphaSrcFactor;
public uint Unknown0x1354;
public BlendFactor AlphaDstFactor;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/Boolean32.cs b/Ryujinx.Graphics.Gpu/State/Boolean32.cs
index ff701d9e..78e13b73 100644
--- a/Ryujinx.Graphics.Gpu/State/Boolean32.cs
+++ b/Ryujinx.Graphics.Gpu/State/Boolean32.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct Boolean32
{
+#pragma warning disable CS0649
private uint _value;
+#pragma warning restore CS0649
public static implicit operator bool(Boolean32 value)
{
diff --git a/Ryujinx.Graphics.Gpu/State/ClearColors.cs b/Ryujinx.Graphics.Gpu/State/ClearColors.cs
index b9f7b684..ba29c899 100644
--- a/Ryujinx.Graphics.Gpu/State/ClearColors.cs
+++ b/Ryujinx.Graphics.Gpu/State/ClearColors.cs
@@ -5,9 +5,11 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ClearColors
{
+#pragma warning disable CS0649
public float Red;
public float Green;
public float Blue;
public float Alpha;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/ConditionState.cs b/Ryujinx.Graphics.Gpu/State/ConditionState.cs
index bad266d9..3388e8f0 100644
--- a/Ryujinx.Graphics.Gpu/State/ConditionState.cs
+++ b/Ryujinx.Graphics.Gpu/State/ConditionState.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ConditionState
{
+#pragma warning disable CS0649
public GpuVa Address;
public Condition Condition;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs b/Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs
index 7393c969..67c3e214 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs
@@ -5,11 +5,13 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyBufferParams
{
+#pragma warning disable CS0649
public GpuVa SrcAddress;
public GpuVa DstAddress;
public int SrcStride;
public int DstStride;
public int XCount;
public int YCount;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs b/Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs
index 5b3d7076..b4a9d9c2 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyBufferSwizzle
{
+#pragma warning disable CS0649
public uint Swizzle;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks the size of each vector component of the copy.
diff --git a/Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs b/Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs
index 98d113a3..dfbab37a 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyBufferTexture
{
+#pragma warning disable CS0649
public MemoryLayout MemoryLayout;
public int Width;
public int Height;
@@ -12,5 +13,6 @@ namespace Ryujinx.Graphics.Gpu.State
public int RegionZ;
public ushort RegionX;
public ushort RegionY;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/CopyRegion.cs b/Ryujinx.Graphics.Gpu/State/CopyRegion.cs
index a256594b..29889835 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyRegion.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyRegion.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyRegion
{
+#pragma warning disable CS0649
public int DstX;
public int DstY;
public int DstWidth;
@@ -13,5 +14,6 @@ namespace Ryujinx.Graphics.Gpu.State
public long SrcHeightRF;
public long SrcXF;
public long SrcYF;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/CopyTexture.cs b/Ryujinx.Graphics.Gpu/State/CopyTexture.cs
index df723d0d..52e35498 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyTexture.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyTexture.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyTexture
{
+#pragma warning disable CS0649
public RtFormat Format;
public Boolean32 LinearLayout;
public MemoryLayout MemoryLayout;
@@ -14,5 +15,6 @@ namespace Ryujinx.Graphics.Gpu.State
public int Width;
public int Height;
public GpuVa Address;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs b/Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs
index cfc64fc4..50fb9010 100644
--- a/Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs
+++ b/Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct CopyTextureControl
{
+#pragma warning disable CS0649
public uint Packed;
+#pragma warning restore CS0649
public bool UnpackLinearFilter()
{
diff --git a/Ryujinx.Graphics.Gpu/State/DepthBiasState.cs b/Ryujinx.Graphics.Gpu/State/DepthBiasState.cs
index 75270625..0a125804 100644
--- a/Ryujinx.Graphics.Gpu/State/DepthBiasState.cs
+++ b/Ryujinx.Graphics.Gpu/State/DepthBiasState.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct DepthBiasState
{
+#pragma warning disable CS0649
public Boolean32 PointEnable;
public Boolean32 LineEnable;
public Boolean32 FillEnable;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/FaceState.cs b/Ryujinx.Graphics.Gpu/State/FaceState.cs
index 10dec3b9..e817b3ae 100644
--- a/Ryujinx.Graphics.Gpu/State/FaceState.cs
+++ b/Ryujinx.Graphics.Gpu/State/FaceState.cs
@@ -7,8 +7,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct FaceState
{
+#pragma warning disable CS0649
public Boolean32 CullEnable;
public FrontFace FrontFace;
public Face CullFace;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/GpuVa.cs b/Ryujinx.Graphics.Gpu/State/GpuVa.cs
index 76a2fddf..d6b7def3 100644
--- a/Ryujinx.Graphics.Gpu/State/GpuVa.cs
+++ b/Ryujinx.Graphics.Gpu/State/GpuVa.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct GpuVa
{
+#pragma warning disable CS0649
public uint High;
public uint Low;
+#pragma warning restore CS0649
/// <summary>
/// Packs the split address into a 64-bits address value.
diff --git a/Ryujinx.Graphics.Gpu/State/IndexBufferState.cs b/Ryujinx.Graphics.Gpu/State/IndexBufferState.cs
index b7868bb9..8ae38bb8 100644
--- a/Ryujinx.Graphics.Gpu/State/IndexBufferState.cs
+++ b/Ryujinx.Graphics.Gpu/State/IndexBufferState.cs
@@ -8,10 +8,12 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct IndexBufferState
{
+#pragma warning disable CS0649
public GpuVa Address;
public GpuVa EndAddress;
public IndexType Type;
public int First;
public int Count;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs b/Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs
index 45555be2..f4009592 100644
--- a/Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs
+++ b/Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct Inline2MemoryParams
{
+#pragma warning disable CS0649
public int LineLengthIn;
public int LineCount;
public GpuVa DstAddress;
@@ -16,5 +17,6 @@ namespace Ryujinx.Graphics.Gpu.State
public int DstZ;
public int DstX;
public int DstY;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/MemoryLayout.cs b/Ryujinx.Graphics.Gpu/State/MemoryLayout.cs
index 9b72b097..c98831f9 100644
--- a/Ryujinx.Graphics.Gpu/State/MemoryLayout.cs
+++ b/Ryujinx.Graphics.Gpu/State/MemoryLayout.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct MemoryLayout
{
+#pragma warning disable CS0649
public uint Packed;
+#pragma warning restore CS0649
public int UnpackGobBlocksInX()
{
diff --git a/Ryujinx.Graphics.Gpu/State/PoolState.cs b/Ryujinx.Graphics.Gpu/State/PoolState.cs
index eeb56918..ba4dfb78 100644
--- a/Ryujinx.Graphics.Gpu/State/PoolState.cs
+++ b/Ryujinx.Graphics.Gpu/State/PoolState.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct PoolState
{
+#pragma warning disable CS0649
public GpuVa Address;
public int MaximumId;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs b/Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs
index 96795083..d046b522 100644
--- a/Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs
+++ b/Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct PrimitiveRestartState
{
+#pragma warning disable CS0649
public Boolean32 Enable;
public int Index;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/ReportState.cs b/Ryujinx.Graphics.Gpu/State/ReportState.cs
index 7430ea31..0c14bfe9 100644
--- a/Ryujinx.Graphics.Gpu/State/ReportState.cs
+++ b/Ryujinx.Graphics.Gpu/State/ReportState.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ReportState
{
+#pragma warning disable CS0649
public GpuVa Address;
public int Payload;
public uint Control;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/RtColorMask.cs b/Ryujinx.Graphics.Gpu/State/RtColorMask.cs
index 4aa5c331..3567bf37 100644
--- a/Ryujinx.Graphics.Gpu/State/RtColorMask.cs
+++ b/Ryujinx.Graphics.Gpu/State/RtColorMask.cs
@@ -6,7 +6,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct RtColorMask
{
+#pragma warning disable CS0649
public uint Packed;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks red channel enable.
diff --git a/Ryujinx.Graphics.Gpu/State/RtColorState.cs b/Ryujinx.Graphics.Gpu/State/RtColorState.cs
index 9261526a..82ccaf74 100644
--- a/Ryujinx.Graphics.Gpu/State/RtColorState.cs
+++ b/Ryujinx.Graphics.Gpu/State/RtColorState.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct RtColorState
{
+#pragma warning disable CS0649
public GpuVa Address;
public int WidthOrStride;
public int Height;
@@ -20,5 +21,6 @@ namespace Ryujinx.Graphics.Gpu.State
public int Padding3;
public int Padding4;
public int Padding5;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/RtControl.cs b/Ryujinx.Graphics.Gpu/State/RtControl.cs
index 2e28660b..8b6b1867 100644
--- a/Ryujinx.Graphics.Gpu/State/RtControl.cs
+++ b/Ryujinx.Graphics.Gpu/State/RtControl.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct RtControl
{
+#pragma warning disable CS0649
public uint Packed;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks the number of active draw buffers.
diff --git a/Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs b/Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs
index abc28fca..ceab1c2f 100644
--- a/Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs
+++ b/Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs
@@ -5,9 +5,11 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct RtDepthStencilState
{
+#pragma warning disable CS0649
public GpuVa Address;
public RtFormat Format;
public MemoryLayout MemoryLayout;
public int LayerSize;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/ScissorState.cs b/Ryujinx.Graphics.Gpu/State/ScissorState.cs
index 06766640..4f4b02dc 100644
--- a/Ryujinx.Graphics.Gpu/State/ScissorState.cs
+++ b/Ryujinx.Graphics.Gpu/State/ScissorState.cs
@@ -2,11 +2,13 @@
{
struct ScissorState
{
+#pragma warning disable CS0649
public Boolean32 Enable;
public ushort X1;
public ushort X2;
public ushort Y1;
public ushort Y2;
public uint Padding;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/ShaderState.cs b/Ryujinx.Graphics.Gpu/State/ShaderState.cs
index 62c7ed4d..4cf67c74 100644
--- a/Ryujinx.Graphics.Gpu/State/ShaderState.cs
+++ b/Ryujinx.Graphics.Gpu/State/ShaderState.cs
@@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ShaderState
{
+#pragma warning disable CS0649
public uint Control;
public uint Offset;
public uint Unknown0x8;
@@ -21,6 +22,7 @@ namespace Ryujinx.Graphics.Gpu.State
public uint Unknown0x34;
public uint Unknown0x38;
public uint Unknown0x3c;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks shader enable information.
diff --git a/Ryujinx.Graphics.Gpu/State/Size3D.cs b/Ryujinx.Graphics.Gpu/State/Size3D.cs
index 0fa3314a..1c127da6 100644
--- a/Ryujinx.Graphics.Gpu/State/Size3D.cs
+++ b/Ryujinx.Graphics.Gpu/State/Size3D.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct Size3D
{
+#pragma warning disable CS0649
public int Width;
public int Height;
public int Depth;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs b/Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs
index f9ee613f..49061cc5 100644
--- a/Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs
+++ b/Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct StencilBackMasks
{
+#pragma warning disable CS0649
public int FuncRef;
public int Mask;
public int FuncMask;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs b/Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs
index 0169b5e7..16655322 100644
--- a/Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs
+++ b/Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs
@@ -7,10 +7,12 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct StencilBackTestState
{
+#pragma warning disable CS0649
public Boolean32 TwoSided;
public StencilOp BackSFail;
public StencilOp BackDpFail;
public StencilOp BackDpPass;
public CompareOp BackFunc;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/StencilTestState.cs b/Ryujinx.Graphics.Gpu/State/StencilTestState.cs
index a50de6e6..72f85f2b 100644
--- a/Ryujinx.Graphics.Gpu/State/StencilTestState.cs
+++ b/Ryujinx.Graphics.Gpu/State/StencilTestState.cs
@@ -7,6 +7,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct StencilTestState
{
+#pragma warning disable CS0649
public Boolean32 Enable;
public StencilOp FrontSFail;
public StencilOp FrontDpFail;
@@ -15,5 +16,6 @@ namespace Ryujinx.Graphics.Gpu.State
public int FrontFuncRef;
public int FrontFuncMask;
public int FrontMask;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/UniformBufferState.cs b/Ryujinx.Graphics.Gpu/State/UniformBufferState.cs
index 15fe556e..d547ea82 100644
--- a/Ryujinx.Graphics.Gpu/State/UniformBufferState.cs
+++ b/Ryujinx.Graphics.Gpu/State/UniformBufferState.cs
@@ -5,8 +5,10 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct UniformBufferState
{
+#pragma warning disable CS0649
public int Size;
public GpuVa Address;
public int Offset;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/VertexAttribState.cs b/Ryujinx.Graphics.Gpu/State/VertexAttribState.cs
index c22b1ca9..dbb75a5b 100644
--- a/Ryujinx.Graphics.Gpu/State/VertexAttribState.cs
+++ b/Ryujinx.Graphics.Gpu/State/VertexAttribState.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct VertexAttribState
{
+#pragma warning disable CS0649
public uint Attribute;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks the index of the vertex buffer this attribute belongs to.
diff --git a/Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs b/Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs
index b1c9a087..3e11838a 100644
--- a/Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs
+++ b/Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs
@@ -5,7 +5,9 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct VertexBufferDrawState
{
+#pragma warning disable CS0649
public int First;
public int Count;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/VertexBufferState.cs b/Ryujinx.Graphics.Gpu/State/VertexBufferState.cs
index e514f2a9..85176d82 100644
--- a/Ryujinx.Graphics.Gpu/State/VertexBufferState.cs
+++ b/Ryujinx.Graphics.Gpu/State/VertexBufferState.cs
@@ -5,9 +5,11 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct VertexBufferState
{
+#pragma warning disable CS0649
public uint Control;
public GpuVa Address;
public int Divisor;
+#pragma warning restore CS0649
/// <summary>
/// Vertex buffer stride, defined as the number of bytes occupied by each vertex in memory.
diff --git a/Ryujinx.Graphics.Gpu/State/ViewportExtents.cs b/Ryujinx.Graphics.Gpu/State/ViewportExtents.cs
index 6675c909..d7728f41 100644
--- a/Ryujinx.Graphics.Gpu/State/ViewportExtents.cs
+++ b/Ryujinx.Graphics.Gpu/State/ViewportExtents.cs
@@ -5,11 +5,13 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ViewportExtents
{
+#pragma warning disable CS0649
public ushort X;
public ushort Width;
public ushort Y;
public ushort Height;
public float DepthNear;
public float DepthFar;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.Graphics.Gpu/State/ViewportTransform.cs b/Ryujinx.Graphics.Gpu/State/ViewportTransform.cs
index c7db311d..b795ea15 100644
--- a/Ryujinx.Graphics.Gpu/State/ViewportTransform.cs
+++ b/Ryujinx.Graphics.Gpu/State/ViewportTransform.cs
@@ -7,6 +7,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// </summary>
struct ViewportTransform
{
+#pragma warning disable CS0649
public float ScaleX;
public float ScaleY;
public float ScaleZ;
@@ -15,6 +16,7 @@ namespace Ryujinx.Graphics.Gpu.State
public float TranslateZ;
public uint Swizzle;
public uint SubpixelPrecisionBias;
+#pragma warning restore CS0649
/// <summary>
/// Unpacks viewport swizzle of the position X component.
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs
index fb961a2d..7f7fd4c6 100644
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -114,7 +114,9 @@ namespace Ryujinx.HLE.HOS
public Keyset KeySet => Device.FileSystem.KeySet;
+#pragma warning disable CS0649
private bool _hasStarted;
+#pragma warning restore CS0649
private bool _isDisposed;
public BlitStruct<ApplicationControlProperty> ControlData { get; set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
index a12a1986..166de065 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
@@ -7,14 +7,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
public KLightServerSession ServerSession { get; }
public KLightClientSession ClientSession { get; }
- private bool _hasBeenInitialized;
-
public KLightSession(Horizon system) : base(system)
{
ServerSession = new KLightServerSession(system, this);
ClientSession = new KLightClientSession(system, this);
-
- _hasBeenInitialized = true;
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs
index fd2078ee..3379e912 100644
--- a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs
@@ -64,6 +64,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
public int AddrSpaceWidth { get; private set; }
private bool _isKernel;
+
private bool _aslrEnabled;
private KMemoryBlockAllocator _blockAllocator;
@@ -78,6 +79,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
_cpuMemory = cpuMemory;
_blocks = new LinkedList<KMemoryBlock>();
+
+ _isKernel = false;
}
private static readonly int[] AddrSpaceSizes = new int[] { 32, 36, 32, 39 };
diff --git a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
index cd60c955..e629be45 100644
--- a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
@@ -66,7 +66,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
private long _affinityMaskOverride;
private int _preferredCoreOverride;
+#pragma warning disable CS0649
private int _affinityOverrideCount;
+#pragma warning restore CS0649
public ThreadSchedState SchedFlags { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
index 686577d7..25c84984 100644
--- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
+++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
@@ -8,7 +8,9 @@ namespace Ryujinx.HLE.HOS.Services.Arp
public int Version;
public byte BaseGameStorageId;
public byte UpdateGameStorageId;
+#pragma warning disable CS0649
public short Padding;
+#pragma warning restore CS0649
public static ApplicationLaunchProperty Default
{
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
index f4a77f2f..6adb874c 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
@@ -2,6 +2,7 @@
{
struct UpdateDataHeader
{
+#pragma warning disable CS0649
public int Revision;
public int BehaviorSize;
public int MemoryPoolSize;
@@ -18,5 +19,6 @@
public int Unknown34;
public int Unknown38;
public int TotalSize;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs
index fc20ec30..8b9a8a94 100644
--- a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs
+++ b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs
@@ -9,7 +9,9 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth
[Service("btdrv")]
class IBluetoothDriver : IpcService
{
+#pragma warning disable CS0169
private string _unknownLowEnergy;
+#pragma warning restore CS0169
public IBluetoothDriver(ServiceCtx context) { }
diff --git a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
index e34c4213..5e84eda6 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
@@ -26,7 +26,9 @@ namespace Ryujinx.HLE.HOS.Services.Hid
private long _npadCommunicationMode;
private uint _accelerometerPlayMode;
+#pragma warning disable CS0649
private long _vibrationGcErmCommand;
+#pragma warning restore CS0649
private float _sevenSixAxisSensorFusionStrength;
private HidSensorFusionParameters _sensorFusionParams;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs
index 6653c0f0..a19e180f 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs
@@ -1,12 +1,10 @@
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
+using Ryujinx.Common.Logging;
using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu.Types;
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
using System;
using System.Collections.Concurrent;
-using System.Diagnostics;
namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu
{
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs
index 1ef880af..7f41f26a 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs
@@ -2,6 +2,8 @@
{
struct UnmapBufferArguments
{
+#pragma warning disable CS0649
public long Offset;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs
index 22cfba3d..8e2c6ca3 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs
@@ -2,8 +2,10 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel
{
class NvChannel
{
+#pragma warning disable CS0649
public int Timeout;
public int SubmitTimeout;
public int Timeslice;
+#pragma warning restore CS0649
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs
index ac7092a6..53d4c98c 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs
@@ -1,6 +1,5 @@
using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.Kernel.Common;
-using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu.Types;
using System;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs
index 5b44109a..d6648178 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs
@@ -44,8 +44,10 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu.Types
struct CharacteristicsHeader
{
+#pragma warning disable CS0649
public long BufferSize;
public long BufferAddress;
+#pragma warning restore CS0649
}
[StructLayout(LayoutKind.Sequential)]
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs
index 3903b77c..88ec1487 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs
@@ -4,8 +4,10 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
{
class NvMapHandle
{
+#pragma warning disable CS0649
public int Handle;
public int Id;
+#pragma warning restore CS0649
public int Size;
public int Align;
public int Kind;
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs
index b7d98506..32e8af7c 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs
@@ -2,11 +2,13 @@
{
struct ElfSymbol32
{
+#pragma warning disable CS0649
public uint NameOffset;
public uint ValueAddress;
public uint Size;
public char Info;
public char Other;
public ushort SectionIndex;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs
index 662de1ff..9290e014 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs
@@ -2,11 +2,13 @@
{
struct ElfSymbol64
{
+#pragma warning disable CS0649
public uint NameOffset;
public char Info;
public char Other;
public ushort SectionIndex;
public ulong ValueAddress;
public ulong Size;
+#pragma warning restore CS0649
}
}
diff --git a/Ryujinx.HLE/Switch.cs b/Ryujinx.HLE/Switch.cs
index 040fbf1c..c9b8daa5 100644
--- a/Ryujinx.HLE/Switch.cs
+++ b/Ryujinx.HLE/Switch.cs
@@ -34,8 +34,6 @@ namespace Ryujinx.HLE
public AutoResetEvent VsyncEvent { get; private set; }
- public event EventHandler Finish;
-
public Switch(VirtualFileSystem fileSystem, ContentManager contentManager, IRenderer renderer, IAalOutput audioOut)
{
if (renderer == null)
diff --git a/Ryujinx.HLE/Utilities/FontUtils.cs b/Ryujinx.HLE/Utilities/FontUtils.cs
index 3da0ef68..91cbdee7 100644
--- a/Ryujinx.HLE/Utilities/FontUtils.cs
+++ b/Ryujinx.HLE/Utilities/FontUtils.cs
@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.Utilities
public static byte[] DecryptFont(Stream bfttfStream)
{
- uint KXor(uint In) => In ^ 0x06186249;
+ uint KXor(uint In) => In ^ FontKey;
using (BinaryReader reader = new BinaryReader(bfttfStream))
{
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index 4bbfc78b..7d1b7d42 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -1,5 +1,4 @@
using Gtk;
-using JsonPrettyPrinterPlus;
using LibHac.Common;
using LibHac.Ns;
using Ryujinx.Audio;
@@ -12,15 +11,11 @@ using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.HOS.Services.Hid;
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Utf8Json;
-using Utf8Json.Resolvers;
using GUI = Gtk.Builder.ObjectAttribute;
@@ -42,14 +37,17 @@ namespace Ryujinx.Ui
private static bool _updatingGameTable;
private static bool _gameLoaded;
private static bool _ending;
+#pragma warning disable CS0169
private static bool _debuggerOpened;
+#pragma warning restore CS0169
private static TreeView _treeView;
+#pragma warning disable CS0169
private static Ryujinx.Debugger.Debugger _debugger;
+#pragma warning restore CS0169
-#pragma warning disable CS0649
-#pragma warning disable IDE0044
+#pragma warning disable CS0169, CS0649, IDE0044
[GUI] Window _mainWin;
[GUI] MenuBar _menuBar;
@@ -83,8 +81,7 @@ namespace Ryujinx.Ui
[GUI] Label _vSyncStatus;
[GUI] Box _listStatusBox;
-#pragma warning restore CS0649
-#pragma warning restore IDE0044
+#pragma warning restore CS0649, IDE0044, CS0169
public MainWindow() : this(new Builder("Ryujinx.Ui.MainWindow.glade")) { }