prelaw/Ryujinx
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Suppress warnings from fields never used or never assigned (CS0169 and CS0649) (#919)

Browse source 
* 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
This commit is contained in:
Cristallix 2020-04-20 23:59:59 +02:00 committed by GitHub
parent 91fa1debd4
commit 4738113f29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 127 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ARMeilleure/Diagnostics/Logger.cs
View file

@ -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()
{

2
ARMeilleure/Statistics.cs
View file

@ -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;

2
Ryujinx.Debugger/Profiler/Profile.cs
View file

@ -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")]

2
Ryujinx.Debugger/UI/DebuggerWidget.cs
View file

@ -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")) { }

4
Ryujinx.Debugger/UI/ProfilerWidget.cs
View file

@ -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
}

6
Ryujinx.Graphics.Gpu/DmaPusher.cs
View file

@ -81,9 +81,6 @@ namespace Ryujinx.Graphics.Gpu
private DmaState _state;
private bool _sliEnable;
private bool _sliActive;
private bool _ibEnable;
private GpuContext _context;
@ -216,11 +213,8 @@ namespace Ryujinx.Graphics.Gpu
_state.MethodCount = word & 0xffffff;
}
else if (_state.MethodCount != 0)
{
if (!_sliEnable || _sliActive)
{
CallMethod(word);
}
if (!_state.NonIncrementing)
{

2
Ryujinx.Graphics.Gpu/Engine/Methods.cs
View file

@ -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()
{

2
Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/Shader/ShaderAddresses.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/BlendState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/BlendStateCommon.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/Boolean32.cs
View file

@ -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)
{

2
Ryujinx.Graphics.Gpu/State/ClearColors.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/ConditionState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/CopyBufferParams.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/CopyBufferSwizzle.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/CopyBufferTexture.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/CopyRegion.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/CopyTexture.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/CopyTextureControl.cs
View file

@ -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()
{

2
Ryujinx.Graphics.Gpu/State/DepthBiasState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/FaceState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/GpuVa.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/IndexBufferState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/Inline2MemoryParams.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/MemoryLayout.cs
View file

@ -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()
{

2
Ryujinx.Graphics.Gpu/State/PoolState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/PrimitiveRestartState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/ReportState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/RtColorMask.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/RtColorState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/RtControl.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/RtDepthStencilState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/ScissorState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/ShaderState.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/Size3D.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/StencilBackMasks.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/StencilBackTestState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/StencilTestState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/UniformBufferState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/VertexAttribState.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/VertexBufferDrawState.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/VertexBufferState.cs
View file

@ -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.

2
Ryujinx.Graphics.Gpu/State/ViewportExtents.cs
View file

@ -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
}
}

2
Ryujinx.Graphics.Gpu/State/ViewportTransform.cs
View file

@ -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.

2
Ryujinx.HLE/HOS/Horizon.cs
View file

@ -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; }

4
Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
View file

@ -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;
}
}
}

3
Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs
View file

@ -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 };

2
Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
View file

@ -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; }

2
Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs
View file

@ -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
{

2
Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
View file

@ -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
}
}

2
Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs
View file

@ -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) { }

2
Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
View file

@ -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;

4
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs
View file

@ -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
{

2
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/UnmapBufferArguments.cs
View file

@ -2,6 +2,8 @@
{
struct UnmapBufferArguments
{
#pragma warning disable CS0649
public long Offset;
#pragma warning restore CS0649
}
}

2
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/Types/NvChannel.cs
View file

@ -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
}
}

1
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuDeviceFile.cs
View file

@ -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;

2
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/GetCharacteristicsArguments.cs
View file

@ -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)]

2
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/Types/NvMapHandle.cs
View file

@ -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;

2
Ryujinx.HLE/Loaders/Elf/ElfSymbol32.cs
View file

@ -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
}
}

2
Ryujinx.HLE/Loaders/Elf/ElfSymbol64.cs
View file

@ -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
}
}

2
Ryujinx.HLE/Switch.cs
View file

@ -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)

2
Ryujinx.HLE/Utilities/FontUtils.cs
View file

@ -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))
{

15
Ryujinx/Ui/MainWindow.cs
View file

@ -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")) { }