Compare commits

..

7 Commits

Author SHA1 Message Date
TSRBerry
b29ded1d60 [Ryujinx.SDL2.Common] Address dotnet-format issues (#5387)
* dotnet format style --severity info

Some changes were manually reverted.

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address most dotnet format whitespace warnings

* dotnet format whitespace after rebase
2023-06-26 01:51:16 +00:00
Mary
9860bfb2cd misc: memory: Migrate from OutOfMemoryException to SystemException entirely (#5399)
Fix a regression with address space allocation while providing more
information about the context of the exception.
2023-06-26 01:37:12 +00:00
TSRBerry
f6ada8d169 [Ryujinx.Graphics.Device] Address dotnet-format issues (#5363)
* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Address most dotnet format whitespace warnings

* dotnet format whitespace after rebase
2023-06-25 23:58:44 +02:00
TSRBerry
42d31f646d [Ryujinx.Audio.Backends.SDL2] Address dotnet-format issues (#5364)
* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Address dotnet format CA1816 warnings

* Address most dotnet format whitespace warnings

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

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

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

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* Update src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

---------

Co-authored-by: Ac_K <Acoustik666@gmail.com>
2023-06-25 22:50:59 +02:00
TSRBerry
07fc3ded68 [Ryujinx.Graphics.Nvdec] Address dotnet-format issues (#5369)
* dotnet format style --severity info

Some changes were manually reverted.

* Restore a few unused methods and variables

* 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

* Add comments to disabled warnings

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

* 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
2023-06-25 21:44:42 +02:00
TSRBerry
fd01259d2b [Ryujinx.ShaderTools] Address dotnet-format issues (#5388)
* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format whitespace after rebase
2023-06-25 21:37:33 +02:00
TSRBerry
7ffe7f8442 [Ryujinx.Graphics.Nvdec.FFmpeg] Address dotnet-format issues (#5370)
* dotnet format style --severity info

Some changes were manually reverted.

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* 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 comments to disabled warnings

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

* 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
2023-06-25 19:03:48 +02:00
41 changed files with 130 additions and 125 deletions

View File

@@ -19,12 +19,14 @@ namespace Ryujinx.Audio.Backends.SDL2
private readonly ManualResetEvent _pauseEvent; private readonly ManualResetEvent _pauseEvent;
private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions; private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
private bool _supportSurroundConfiguration; private readonly bool _supportSurroundConfiguration;
// TODO: Add this to SDL2-CS // TODO: Add this to SDL2-CS
// NOTE: We use a DllImport here because of marshaling issue for spec. // NOTE: We use a DllImport here because of marshaling issue for spec.
#pragma warning disable SYSLIB1054
[DllImport("SDL2")] [DllImport("SDL2")]
private static extern int SDL_GetDefaultAudioInfo(IntPtr name, out SDL_AudioSpec spec, int isCapture); private static extern int SDL_GetDefaultAudioInfo(IntPtr name, out SDL_AudioSpec spec, int isCapture);
#pragma warning restore SYSLIB1054
public SDL2HardwareDeviceDriver() public SDL2HardwareDeviceDriver()
{ {
@@ -90,7 +92,7 @@ namespace Ryujinx.Audio.Backends.SDL2
throw new NotImplementedException("Input direction is currently not implemented on SDL2 backend!"); throw new NotImplementedException("Input direction is currently not implemented on SDL2 backend!");
} }
SDL2HardwareDeviceSession session = new SDL2HardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume); SDL2HardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
_sessions.TryAdd(session, 0); _sessions.TryAdd(session, 0);
@@ -135,8 +137,7 @@ namespace Ryujinx.Audio.Backends.SDL2
if (device == 0) if (device == 0)
{ {
Logger.Error?.Print(LogClass.Application, Logger.Error?.Print(LogClass.Application, $"SDL2 open audio device initialization failed with error \"{SDL_GetError()}\"");
$"SDL2 open audio device initialization failed with error \"{SDL_GetError()}\"");
return 0; return 0;
} }
@@ -156,6 +157,7 @@ namespace Ryujinx.Audio.Backends.SDL2
public void Dispose() public void Dispose()
{ {
GC.SuppressFinalize(this);
Dispose(true); Dispose(true);
} }

View File

@@ -12,19 +12,19 @@ namespace Ryujinx.Audio.Backends.SDL2
{ {
class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase class SDL2HardwareDeviceSession : HardwareDeviceSessionOutputBase
{ {
private SDL2HardwareDeviceDriver _driver; private readonly SDL2HardwareDeviceDriver _driver;
private ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers; private readonly ConcurrentQueue<SDL2AudioBuffer> _queuedBuffers;
private DynamicRingBuffer _ringBuffer; private readonly DynamicRingBuffer _ringBuffer;
private ulong _playedSampleCount; private ulong _playedSampleCount;
private ManualResetEvent _updateRequiredEvent; private readonly ManualResetEvent _updateRequiredEvent;
private uint _outputStream; private uint _outputStream;
private bool _hasSetupError; private bool _hasSetupError;
private SDL_AudioCallback _callbackDelegate; private readonly SDL_AudioCallback _callbackDelegate;
private int _bytesPerFrame; private readonly int _bytesPerFrame;
private uint _sampleCount; private uint _sampleCount;
private bool _started; private bool _started;
private float _volume; private float _volume;
private ushort _nativeSampleFormat; private readonly ushort _nativeSampleFormat;
public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount) public SDL2HardwareDeviceSession(SDL2HardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
{ {
@@ -72,7 +72,7 @@ namespace Ryujinx.Audio.Backends.SDL2
private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength) private unsafe void Update(IntPtr userdata, IntPtr stream, int streamLength)
{ {
Span<byte> streamSpan = new Span<byte>((void*)stream, streamLength); Span<byte> streamSpan = new((void*)stream, streamLength);
int maxFrameCount = (int)GetSampleCount(streamLength); int maxFrameCount = (int)GetSampleCount(streamLength);
int bufferedFrames = _ringBuffer.Length / _bytesPerFrame; int bufferedFrames = _ringBuffer.Length / _bytesPerFrame;
@@ -82,7 +82,7 @@ namespace Ryujinx.Audio.Backends.SDL2
if (frameCount == 0) if (frameCount == 0)
{ {
// SDL2 left the responsibility to the user to clear the buffer. // SDL2 left the responsibility to the user to clear the buffer.
streamSpan.Fill(0); streamSpan.Clear();
return; return;
} }
@@ -96,7 +96,7 @@ namespace Ryujinx.Audio.Backends.SDL2
IntPtr pStreamSrc = (IntPtr)p; IntPtr pStreamSrc = (IntPtr)p;
// Zero the dest buffer // Zero the dest buffer
streamSpan.Fill(0); streamSpan.Clear();
// Apply volume to written data // Apply volume to written data
SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_volume * SDL_MIX_MAXVOLUME)); SDL_MixAudioFormat(stream, pStreamSrc, _nativeSampleFormat, (uint)samples.Length, (int)(_volume * SDL_MIX_MAXVOLUME));
@@ -151,7 +151,7 @@ namespace Ryujinx.Audio.Backends.SDL2
if (_outputStream != 0) if (_outputStream != 0)
{ {
SDL2AudioBuffer driverBuffer = new SDL2AudioBuffer(buffer.DataPointer, GetSampleCount(buffer)); SDL2AudioBuffer driverBuffer = new(buffer.DataPointer, GetSampleCount(buffer));
_ringBuffer.Write(buffer.Data, 0, buffer.Data.Length); _ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);

View File

@@ -199,7 +199,7 @@ namespace Ryujinx.Cpu
break; break;
} }
catch (OutOfMemoryException) catch (SystemException)
{ {
baseMemory?.Dispose(); baseMemory?.Dispose();
mirrorMemory?.Dispose(); mirrorMemory?.Dispose();

View File

@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Device
public TState State; public TState State;
private uint Size => (uint)(Unsafe.SizeOf<TState>() + RegisterSize - 1) / RegisterSize; private static uint Size => (uint)(Unsafe.SizeOf<TState>() + RegisterSize - 1) / RegisterSize;
private readonly Func<int>[] _readCallbacks; private readonly Func<int>[] _readCallbacks;
private readonly Action<int>[] _writeCallbacks; private readonly Action<int>[] _writeCallbacks;

View File

@@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
private readonly AVCodec_decode _decodeFrame; private readonly AVCodec_decode _decodeFrame;
private static readonly FFmpegApi.av_log_set_callback_callback _logFunc; private static readonly FFmpegApi.av_log_set_callback_callback _logFunc;
private readonly AVCodec* _codec; private readonly AVCodec* _codec;
private AVPacket* _packet; private readonly AVPacket* _packet;
private AVCodecContext* _context; private readonly AVCodecContext* _context;
public FFmpegContext(AVCodecID codecId) public FFmpegContext(AVCodecID codecId)
{ {
@@ -164,7 +164,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
FFmpegApi.av_packet_free(ppPacket); FFmpegApi.av_packet_free(ppPacket);
} }
FFmpegApi.avcodec_close(_context); _ = FFmpegApi.avcodec_close(_context);
fixed (AVCodecContext** ppContext = &_context) fixed (AVCodecContext** ppContext = &_context)
{ {

View File

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
private readonly byte[] _workBuffer = new byte[WorkBufferSize]; private readonly byte[] _workBuffer = new byte[WorkBufferSize];
private FFmpegContext _context = new FFmpegContext(AVCodecID.AV_CODEC_ID_H264); private FFmpegContext _context = new(AVCodecID.AV_CODEC_ID_H264);
private int _oldOutputWidth; private int _oldOutputWidth;
private int _oldOutputHeight; private int _oldOutputHeight;
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
byte[] output = new byte[data.Length + prep.Length]; byte[] output = new byte[data.Length + prep.Length];
prep.CopyTo(output); prep.CopyTo(output);
data.CopyTo(new Span<byte>(output).Slice(prep.Length)); data.CopyTo(new Span<byte>(output)[prep.Length..]);
return output; return output;
} }

View File

@@ -84,9 +84,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
Flush(); Flush();
} }
public Span<byte> AsSpan() public readonly Span<byte> AsSpan()
{ {
return new Span<byte>(_workBuffer).Slice(0, _offset); return new Span<byte>(_workBuffer)[.._offset];
} }
public void WriteU(uint value, int valueSize) => WriteBits((int)value, valueSize); public void WriteU(uint value, int valueSize) => WriteBits((int)value, valueSize);

View File

@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
{ {
public static Span<byte> Reconstruct(ref H264PictureInfo pictureInfo, byte[] workBuffer) public static Span<byte> Reconstruct(ref H264PictureInfo pictureInfo, byte[] workBuffer)
{ {
H264BitStreamWriter writer = new H264BitStreamWriter(workBuffer); H264BitStreamWriter writer = new(workBuffer);
// Sequence Parameter Set. // Sequence Parameter Set.
writer.WriteU(1, 24); writer.WriteU(1, 24);

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct AVCodec struct AVCodec
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public unsafe byte* Name; public unsafe byte* Name;
public unsafe byte* LongName; public unsafe byte* LongName;
public int Type; public int Type;

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct AVCodec501 struct AVCodec501
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public unsafe byte* Name; public unsafe byte* Name;
public unsafe byte* LongName; public unsafe byte* LongName;
public int Type; public int Type;

View File

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct AVCodecContext struct AVCodecContext
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public unsafe IntPtr AvClass; public unsafe IntPtr AvClass;
public int LogLevelOffset; public int LogLevelOffset;
public int CodecType; public int CodecType;

View File

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct AVFrame struct AVFrame
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public Array8<IntPtr> Data; public Array8<IntPtr> Data;
public Array8<int> LineSize; public Array8<int> LineSize;
public IntPtr ExtendedData; public IntPtr ExtendedData;

View File

@@ -1,25 +1,23 @@
using System; using AVBufferRef = System.IntPtr;
using AVBufferRef = System.IntPtr;
namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct AVPacket struct AVPacket
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public unsafe AVBufferRef *Buf; public unsafe AVBufferRef* Buf;
public long Pts; public long Pts;
public long Dts; public long Dts;
public unsafe byte* Data; public unsafe byte* Data;
public int Size; public int Size;
public int StreamIndex; public int StreamIndex;
public int Flags; public int Flags;
public IntPtr SizeData; public AVBufferRef SizeData;
public int SizeDataElems; public int SizeDataElems;
public long Duration; public long Duration;
public long Position; public long Position;
public IntPtr Opaque; public AVBufferRef Opaque;
public unsafe AVBufferRef *OpaqueRef; public unsafe AVBufferRef* OpaqueRef;
public AVRational TimeBase; public AVRational TimeBase;
#pragma warning restore CS0649 #pragma warning restore CS0649
} }

View File

@@ -2,9 +2,9 @@
namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct FFCodec<T> where T: struct struct FFCodec<T> where T : struct
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public T Base; public T Base;
public int CapsInternalOrCbType; public int CapsInternalOrCbType;
public int PrivDataSize; public int PrivDataSize;

View File

@@ -2,9 +2,9 @@
namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
struct FFCodecLegacy<T> where T: struct struct FFCodecLegacy<T> where T : struct
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public T Base; public T Base;
public uint CapsInternalOrCbType; public uint CapsInternalOrCbType;
public int PrivDataSize; public int PrivDataSize;

View File

@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public const string AvCodecLibraryName = "avcodec"; public const string AvCodecLibraryName = "avcodec";
public const string AvUtilLibraryName = "avutil"; public const string AvUtilLibraryName = "avutil";
private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new Dictionary<string, (int, int)> private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
{ {
{ AvCodecLibraryName, (58, 59) }, { AvCodecLibraryName, (58, 59) },
{ AvUtilLibraryName, (56, 57) } { AvUtilLibraryName, (56, 57) }
@@ -61,9 +61,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{ {
NativeLibrary.SetDllImportResolver(typeof(FFmpegApi).Assembly, (name, assembly, path) => NativeLibrary.SetDllImportResolver(typeof(FFmpegApi).Assembly, (name, assembly, path) =>
{ {
IntPtr handle;
if (name == AvUtilLibraryName && TryLoadWhitelistedLibrary(AvUtilLibraryName, assembly, path, out handle)) if (name == AvUtilLibraryName && TryLoadWhitelistedLibrary(AvUtilLibraryName, assembly, path, out nint handle))
{ {
return handle; return handle;
} }
@@ -106,7 +105,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
internal static unsafe partial AVCodecContext* avcodec_alloc_context3(AVCodec* codec); internal static unsafe partial AVCodecContext* avcodec_alloc_context3(AVCodec* codec);
[LibraryImport(AvCodecLibraryName)] [LibraryImport(AvCodecLibraryName)]
internal static unsafe partial int avcodec_open2(AVCodecContext* avctx, AVCodec* codec, void **options); internal static unsafe partial int avcodec_open2(AVCodecContext* avctx, AVCodec* codec, void** options);
[LibraryImport(AvCodecLibraryName)] [LibraryImport(AvCodecLibraryName)]
internal static unsafe partial int avcodec_close(AVCodecContext* avctx); internal static unsafe partial int avcodec_close(AVCodecContext* avctx);

View File

@@ -11,9 +11,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
public int RequestedWidth { get; } public int RequestedWidth { get; }
public int RequestedHeight { get; } public int RequestedHeight { get; }
public Plane YPlane => new Plane((IntPtr)Frame->Data[0], Stride * Height); public Plane YPlane => new((IntPtr)Frame->Data[0], Stride * Height);
public Plane UPlane => new Plane((IntPtr)Frame->Data[1], UvStride * UvHeight); public Plane UPlane => new((IntPtr)Frame->Data[1], UvStride * UvHeight);
public Plane VPlane => new Plane((IntPtr)Frame->Data[2], UvStride * UvHeight); public Plane VPlane => new((IntPtr)Frame->Data[2], UvStride * UvHeight);
public FrameField Field => Frame->InterlacedFrame != 0 ? FrameField.Interlaced : FrameField.Progressive; public FrameField Field => Frame->InterlacedFrame != 0 ? FrameField.Interlaced : FrameField.Progressive;

View File

@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Vp8
{ {
public bool IsHardwareAccelerated => false; public bool IsHardwareAccelerated => false;
private readonly FFmpegContext _context = new FFmpegContext(AVCodecID.AV_CODEC_ID_VP8); private readonly FFmpegContext _context = new(AVCodecID.AV_CODEC_ID_VP8);
public ISurface CreateSurface(int width, int height) public ISurface CreateSurface(int width, int height)
{ {
@@ -43,7 +43,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Vp8
frame[9] = (byte)((pictureInfo.FrameHeight >> 8) & 0x3F); frame[9] = (byte)((pictureInfo.FrameHeight >> 8) & 0x3F);
} }
bitstream.CopyTo(new Span<byte>(frame).Slice(uncompHeaderSize)); bitstream.CopyTo(new Span<byte>(frame)[uncompHeaderSize..]);
return _context.DecodeFrame(outSurf, frame) == 0; return _context.DecodeFrame(outSurf, frame) == 0;
} }

View File

@@ -43,7 +43,7 @@ namespace Ryujinx.Graphics.Nvdec.Image
int width, int width,
int height) int height)
{ {
OffsetCalculator calc = new OffsetCalculator(width, height, 0, false, 2, 2); OffsetCalculator calc = new(width, height, 0, false, 2, 2);
if (Sse2.IsSupported) if (Sse2.IsSupported)
{ {

View File

@@ -60,7 +60,7 @@ namespace Ryujinx.Graphics.Nvdec.Image
WriteLuma( WriteLuma(
lumaBottom.Memory.Span, lumaBottom.Memory.Span,
surface.YPlane.AsSpan().Slice(surface.Stride), surface.YPlane.AsSpan()[surface.Stride..],
surface.Stride * 2, surface.Stride * 2,
surface.Width, surface.Width,
surface.Height / 2); surface.Height / 2);
@@ -80,8 +80,8 @@ namespace Ryujinx.Graphics.Nvdec.Image
WriteChroma( WriteChroma(
chromaBottom.Memory.Span, chromaBottom.Memory.Span,
surface.UPlane.AsSpan().Slice(surface.UvStride), surface.UPlane.AsSpan()[surface.UvStride..],
surface.VPlane.AsSpan().Slice(surface.UvStride), surface.VPlane.AsSpan()[surface.UvStride..],
surface.UvStride * 2, surface.UvStride * 2,
surface.UvWidth, surface.UvWidth,
surface.UvHeight / 2); surface.UvHeight / 2);
@@ -100,7 +100,7 @@ namespace Ryujinx.Graphics.Nvdec.Image
int width, int width,
int height) int height)
{ {
OffsetCalculator calc = new OffsetCalculator(width, height, 0, false, 2, 2); OffsetCalculator calc = new(width, height, 0, false, 2, 2);
if (Sse2.IsSupported) if (Sse2.IsSupported)
{ {

View File

@@ -14,7 +14,7 @@ namespace Ryujinx.Graphics.Nvdec
private readonly DeviceState<NvdecRegisters> _state; private readonly DeviceState<NvdecRegisters> _state;
private long _currentId; private long _currentId;
private ConcurrentDictionary<long, NvdecDecoderContext> _contexts; private readonly ConcurrentDictionary<long, NvdecDecoderContext> _contexts;
private NvdecDecoderContext _currentContext; private NvdecDecoderContext _currentContext;
public NvdecDevice(MemoryManager gmm) public NvdecDevice(MemoryManager gmm)

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec
{ {
struct NvdecRegisters struct NvdecRegisters
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public Array64<uint> Reserved0; public Array64<uint> Reserved0;
public uint Nop; public uint Nop;
public Array63<uint> Reserved104; public Array63<uint> Reserved104;

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec
{ {
struct NvdecStatus struct NvdecStatus
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public uint MbsCorrectlyDecoded; public uint MbsCorrectlyDecoded;
public uint MbsInError; public uint MbsInError;
public uint Reserved; public uint Reserved;

View File

@@ -5,8 +5,9 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
{ {
struct PictureInfo struct PictureInfo
{ {
#pragma warning disable CS0169, CS0649 #pragma warning disable IDE0051, CS0169, CS0649 // Remove unused private member
Array18<uint> Unknown0; Array18<uint> Unknown0;
#pragma warning restore IDE0051
public uint BitstreamSize; public uint BitstreamSize;
public uint NumSlices; public uint NumSlices;
public uint Unknown50; public uint Unknown50;
@@ -50,24 +51,24 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
public Array10<uint> Unknown2D4; public Array10<uint> Unknown2D4;
#pragma warning restore CS0169, CS0649 #pragma warning restore CS0169, CS0649
public bool MbAdaptiveFrameFieldFlag => (Flags & (1 << 0)) != 0; public readonly bool MbAdaptiveFrameFieldFlag => (Flags & (1 << 0)) != 0;
public bool Direct8x8InferenceFlag => (Flags & (1 << 1)) != 0; public readonly bool Direct8x8InferenceFlag => (Flags & (1 << 1)) != 0;
public bool WeightedPredFlag => (Flags & (1 << 2)) != 0; public readonly bool WeightedPredFlag => (Flags & (1 << 2)) != 0;
public bool ConstrainedIntraPredFlag => (Flags & (1 << 3)) != 0; public readonly bool ConstrainedIntraPredFlag => (Flags & (1 << 3)) != 0;
public bool IsReference => (Flags & (1 << 4)) != 0; public readonly bool IsReference => (Flags & (1 << 4)) != 0;
public bool FieldPicFlag => (Flags & (1 << 5)) != 0; public readonly bool FieldPicFlag => (Flags & (1 << 5)) != 0;
public bool BottomFieldFlag => (Flags & (1 << 6)) != 0; public readonly bool BottomFieldFlag => (Flags & (1 << 6)) != 0;
public uint Log2MaxFrameNumMinus4 => (uint)(Flags >> 8) & 0xf; public readonly uint Log2MaxFrameNumMinus4 => (uint)(Flags >> 8) & 0xf;
public ushort ChromaFormatIdc => (ushort)((Flags >> 12) & 3); public readonly ushort ChromaFormatIdc => (ushort)((Flags >> 12) & 3);
public uint PicOrderCntType => (uint)(Flags >> 14) & 3; public readonly uint PicOrderCntType => (uint)(Flags >> 14) & 3;
public int PicInitQpMinus26 => ExtractSx(Flags, 16, 6); public readonly int PicInitQpMinus26 => ExtractSx(Flags, 16, 6);
public int ChromaQpIndexOffset => ExtractSx(Flags, 22, 5); public readonly int ChromaQpIndexOffset => ExtractSx(Flags, 22, 5);
public int SecondChromaQpIndexOffset => ExtractSx(Flags, 27, 5); public readonly int SecondChromaQpIndexOffset => ExtractSx(Flags, 27, 5);
public uint WeightedBipredIdc => (uint)(Flags >> 32) & 3; public readonly uint WeightedBipredIdc => (uint)(Flags >> 32) & 3;
public uint OutputSurfaceIndex => (uint)(Flags >> 34) & 0x7f; public readonly uint OutputSurfaceIndex => (uint)(Flags >> 34) & 0x7f;
public uint ColIndex => (uint)(Flags >> 41) & 0x1f; public readonly uint ColIndex => (uint)(Flags >> 41) & 0x1f;
public ushort FrameNum => (ushort)(Flags >> 46); public readonly ushort FrameNum => (ushort)(Flags >> 46);
public bool QpprimeYZeroTransformBypassFlag => (Flags2 & (1 << 1)) != 0; public readonly bool QpprimeYZeroTransformBypassFlag => (Flags2 & (1 << 1)) != 0;
private static int ExtractSx(ulong packed, int lsb, int length) private static int ExtractSx(ulong packed, int lsb, int length)
{ {

View File

@@ -4,12 +4,12 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
{ {
struct ReferenceFrame struct ReferenceFrame
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public uint Flags; public uint Flags;
public Array2<uint> FieldOrderCnt; public Array2<uint> FieldOrderCnt;
public uint FrameNum; public uint FrameNum;
#pragma warning restore CS0649 #pragma warning restore CS0649
public uint OutputSurfaceIndex => (uint)Flags & 0x7f; public readonly uint OutputSurfaceIndex => (uint)Flags & 0x7f;
} }
} }

View File

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp8
{ {
struct PictureInfo struct PictureInfo
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public Array13<uint> Unknown0; public Array13<uint> Unknown0;
public uint GpTimerTimeoutValue; public uint GpTimerTimeoutValue;
public ushort FrameWidth; public ushort FrameWidth;

View File

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{ {
struct EntropyProbs struct EntropyProbs
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public Array10<Array10<Array8<byte>>> KfYModeProbE0ToE7; public Array10<Array10<Array8<byte>>> KfYModeProbE0ToE7;
public Array10<Array10<byte>> KfYModeProbE8; public Array10<Array10<byte>> KfYModeProbE8;
public Array3<byte> Padding384; public Array3<byte> Padding384;

View File

@@ -2,7 +2,7 @@
{ {
struct FrameSize struct FrameSize
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public ushort Width; public ushort Width;
public ushort Height; public ushort Height;
public ushort LumaPitch; public ushort LumaPitch;

View File

@@ -2,7 +2,7 @@
{ {
struct FrameStats struct FrameStats
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public uint Unknown0; public uint Unknown0;
public uint Unknown4; public uint Unknown4;
public uint Pass2CycleCount; public uint Pass2CycleCount;

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{ {
struct LoopFilter struct LoopFilter
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public byte ModeRefDeltaEnabled; public byte ModeRefDeltaEnabled;
public Array4<sbyte> RefDeltas; public Array4<sbyte> RefDeltas;
public Array2<sbyte> ModeDeltas; public Array2<sbyte> ModeDeltas;

View File

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{ {
struct PictureInfo struct PictureInfo
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public Array12<uint> Unknown0; public Array12<uint> Unknown0;
public uint BitstreamSize; public uint BitstreamSize;
public uint IsEncrypted; public uint IsEncrypted;
@@ -44,7 +44,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
public uint UnknownFC; public uint UnknownFC;
#pragma warning restore CS0649 #pragma warning restore CS0649
public uint BitDepth => (SurfaceParams >> 1) & 0xf; public readonly uint BitDepth => (SurfaceParams >> 1) & 0xf;
public Vp9PictureInfo Convert() public Vp9PictureInfo Convert()
{ {

View File

@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{ {
struct Segmentation struct Segmentation
{ {
#pragma warning disable CS0649 #pragma warning disable CS0649 // Field is never assigned to
public byte Enabled; public byte Enabled;
public byte UpdateMap; public byte UpdateMap;
public byte TemporalUpdate; public byte TemporalUpdate;

View File

@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Nvdec
{ {
static class Vp9Decoder static class Vp9Decoder
{ {
private static Decoder _decoder = new Decoder(); private static readonly Decoder _decoder = new();
public unsafe static void Decode(ResourceManager rm, ref NvdecRegisters state) public unsafe static void Decode(ResourceManager rm, ref NvdecRegisters state)
{ {

View File

@@ -31,7 +31,7 @@ namespace Ryujinx.Memory
/// </summary> /// </summary>
/// <param name="size">Size of the memory block in bytes</param> /// <param name="size">Size of the memory block in bytes</param>
/// <param name="flags">Flags that controls memory block memory allocation</param> /// <param name="flags">Flags that controls memory block memory allocation</param>
/// <exception cref="OutOfMemoryException">Throw when there's no enough memory to allocate the requested size</exception> /// <exception cref="SystemException">Throw when there's an error while allocating the requested size</exception>
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception> /// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
public MemoryBlock(ulong size, MemoryAllocationFlags flags = MemoryAllocationFlags.None) public MemoryBlock(ulong size, MemoryAllocationFlags flags = MemoryAllocationFlags.None)
{ {
@@ -66,7 +66,7 @@ namespace Ryujinx.Memory
/// </summary> /// </summary>
/// <param name="size">Size of the memory block in bytes</param> /// <param name="size">Size of the memory block in bytes</param>
/// <param name="sharedMemory">Shared memory to use as backing storage for this block</param> /// <param name="sharedMemory">Shared memory to use as backing storage for this block</param>
/// <exception cref="OutOfMemoryException">Throw when there's no enough address space left to map the shared memory</exception> /// <exception cref="SystemException">Throw when there's an error while mapping the shared memory</exception>
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception> /// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
private MemoryBlock(ulong size, IntPtr sharedMemory) private MemoryBlock(ulong size, IntPtr sharedMemory)
{ {
@@ -82,7 +82,7 @@ namespace Ryujinx.Memory
/// </summary> /// </summary>
/// <returns>A new memory block that shares storage with this one</returns> /// <returns>A new memory block that shares storage with this one</returns>
/// <exception cref="NotSupportedException">Throw when the current memory block does not support mirroring</exception> /// <exception cref="NotSupportedException">Throw when the current memory block does not support mirroring</exception>
/// <exception cref="OutOfMemoryException">Throw when there's no enough address space left to map the shared memory</exception> /// <exception cref="SystemException">Throw when there's an error while mapping the shared memory</exception>
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception> /// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
public MemoryBlock CreateMirror() public MemoryBlock CreateMirror()
{ {

View File

@@ -147,12 +147,12 @@ namespace Ryujinx.Memory
fd = shm_open((IntPtr)pMemName, 0x2 | 0x200 | 0x800 | 0x400, 384); // O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600 fd = shm_open((IntPtr)pMemName, 0x2 | 0x200 | 0x800 | 0x400, 384); // O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600
if (fd == -1) if (fd == -1)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
if (shm_unlink((IntPtr)pMemName) != 0) if (shm_unlink((IntPtr)pMemName) != 0)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
} }
} }
@@ -165,22 +165,22 @@ namespace Ryujinx.Memory
fd = mkstemp((IntPtr)pFileName); fd = mkstemp((IntPtr)pFileName);
if (fd == -1) if (fd == -1)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
if (unlink((IntPtr)pFileName) != 0) if (unlink((IntPtr)pFileName) != 0)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
} }
} }
if (ftruncate(fd, (IntPtr)size) != 0) if (ftruncate(fd, (IntPtr)size) != 0)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
return (IntPtr)fd; return fd;
} }
public static void DestroySharedMemory(IntPtr handle) public static void DestroySharedMemory(IntPtr handle)

View File

@@ -114,7 +114,7 @@ namespace Ryujinx.Memory
if (handle == IntPtr.Zero) if (handle == IntPtr.Zero)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
return handle; return handle;
@@ -134,7 +134,7 @@ namespace Ryujinx.Memory
if (ptr == IntPtr.Zero) if (ptr == IntPtr.Zero)
{ {
throw new OutOfMemoryException(); throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
} }
return ptr; return ptr;

View File

@@ -19,10 +19,7 @@ namespace Ryujinx.SDL2.Common
{ {
get get
{ {
if (_instance == null) _instance ??= new SDL2Driver();
{
_instance = new SDL2Driver();
}
return _instance; return _instance;
} }
@@ -43,7 +40,7 @@ namespace Ryujinx.SDL2.Common
private readonly object _lock = new(); private readonly object _lock = new();
private SDL2Driver() {} private SDL2Driver() { }
private const string SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS = "SDL_JOYSTICK_HIDAPI_COMBINE_JOY_CONS"; private const string SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS = "SDL_JOYSTICK_HIDAPI_COMBINE_JOY_CONS";
@@ -80,8 +77,15 @@ namespace Ryujinx.SDL2.Common
} }
// First ensure that we only enable joystick events (for connected/disconnected). // First ensure that we only enable joystick events (for connected/disconnected).
SDL_GameControllerEventState(SDL_DISABLE); if (SDL_GameControllerEventState(SDL_IGNORE) != SDL_IGNORE)
SDL_JoystickEventState(SDL_ENABLE); {
Logger.Error?.PrintMsg(LogClass.Application, "Couldn't change the state of game controller events.");
}
if (SDL_JoystickEventState(SDL_ENABLE) < 0)
{
Logger.Error?.PrintMsg(LogClass.Application, $"Failed to enable joystick event polling: {SDL_GetError()}");
}
// Disable all joysticks information, we don't need them no need to flood the event queue for that. // Disable all joysticks information, we don't need them no need to flood the event queue for that.
SDL_EventState(SDL_EventType.SDL_JOYAXISMOTION, SDL_DISABLE); SDL_EventState(SDL_EventType.SDL_JOYAXISMOTION, SDL_DISABLE);
@@ -153,7 +157,7 @@ namespace Ryujinx.SDL2.Common
{ {
const int WaitTimeMs = 10; const int WaitTimeMs = 10;
using ManualResetEventSlim waitHandle = new ManualResetEventSlim(false); using ManualResetEventSlim waitHandle = new(false);
while (_isRunning) while (_isRunning)
{ {
@@ -199,6 +203,7 @@ namespace Ryujinx.SDL2.Common
public void Dispose() public void Dispose()
{ {
GC.SuppressFinalize(this);
Dispose(true); Dispose(true);
} }
} }

View File

@@ -20,7 +20,7 @@ namespace Ryujinx.ShaderTools
public ReadOnlySpan<ulong> GetCode(ulong address, int minimumSize) public ReadOnlySpan<ulong> GetCode(ulong address, int minimumSize)
{ {
return MemoryMarshal.Cast<byte, ulong>(new ReadOnlySpan<byte>(_data).Slice((int)address)); return MemoryMarshal.Cast<byte, ulong>(new ReadOnlySpan<byte>(_data)[(int)address..]);
} }
} }
@@ -53,7 +53,7 @@ namespace Ryujinx.ShaderTools
byte[] data = File.ReadAllBytes(options.InputPath); byte[] data = File.ReadAllBytes(options.InputPath);
TranslationOptions translationOptions = new TranslationOptions(options.TargetLanguage, options.TargetApi, flags); TranslationOptions translationOptions = new(options.TargetLanguage, options.TargetApi, flags);
ShaderProgram program = Translator.CreateContext(0, new GpuAccessor(data), translationOptions).Translate(); ShaderProgram program = Translator.CreateContext(0, new GpuAccessor(data), translationOptions).Translate();