diff --git a/Ryujinx.Graphics/Gal/IGalMemory.cs b/Ryujinx.Graphics/Gal/IGalMemory.cs index 5161d3f5f1..78eb7154b0 100644 --- a/Ryujinx.Graphics/Gal/IGalMemory.cs +++ b/Ryujinx.Graphics/Gal/IGalMemory.cs @@ -1,6 +1,6 @@ namespace Ryujinx.Graphics.Gal { - public unsafe interface IGalMemory + public interface IGalMemory { int ReadInt32(long position); } diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs index f4994e8a80..0792835a91 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs @@ -646,7 +646,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL return type; } - private unsafe static void SetConstAttrib(GalVertexAttrib attrib) + private static unsafe void SetConstAttrib(GalVertexAttrib attrib) { if (attrib.Size == GalVertexAttribSize._10_10_10_2 || attrib.Size == GalVertexAttribSize._11_11_10) diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs index 19025a9722..734267625c 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs @@ -1,4 +1,3 @@ -using Ryujinx.Graphics.Gal.OpenGL; using Ryujinx.Graphics.Texture; using System; using System.Collections.Generic; diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs index d4633b57a8..521f16ee7c 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs @@ -40,7 +40,7 @@ namespace Ryujinx.Graphics.Gal.Shader return isArray ? GalTextureTarget.TwoDArray : GalTextureTarget.TwoD; case 4: if (isArray) - throw new InvalidOperationException($"ARRAY bit set on a TEX with 3D texture!"); + throw new InvalidOperationException("ARRAY bit set on a TEX with 3D texture!"); return GalTextureTarget.ThreeD; case 6: return isArray ? GalTextureTarget.CubeArray : GalTextureTarget.CubeMap; diff --git a/Ryujinx.Graphics/GpuResourceManager.cs b/Ryujinx.Graphics/GpuResourceManager.cs index 7b78297e98..740e6be86d 100644 --- a/Ryujinx.Graphics/GpuResourceManager.cs +++ b/Ryujinx.Graphics/GpuResourceManager.cs @@ -1,8 +1,6 @@ -using Ryujinx.Common.Logging; using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; -using System; using System.Collections.Generic; namespace Ryujinx.Graphics diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs index b865ce2d13..e72ec4db53 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs @@ -1,4 +1,3 @@ -using Ryujinx.Common.Logging; using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs index 781da3797f..ab2822781f 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs @@ -1,5 +1,4 @@ using Ryujinx.Common; -using Ryujinx.Common.Logging; using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; @@ -656,7 +655,7 @@ namespace Ryujinx.Graphics.Graphics3d _gpu.ResourceManager.SendTexture(vmm, key, image); - return (Key: key, Image: image, Sampler: sampler); + return (key, image, sampler); } private void UploadConstBuffers(NvGpuVmm vmm, GalPipelineState state, long[] keys) diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mf.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mf.cs index c1cfc96766..3c65c457d1 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mf.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mf.cs @@ -1,4 +1,3 @@ -using Ryujinx.Common.Logging; using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; using System.Collections.Generic; diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngineP2mf.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngineP2mf.cs index 988a14c577..d24f2303d9 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngineP2mf.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngineP2mf.cs @@ -1,4 +1,3 @@ -using Ryujinx.Common.Logging; using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; using System.Collections.Generic; diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs index 31b0bae8df..589d2c1aa7 100644 --- a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs +++ b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs @@ -1,6 +1,5 @@ using ChocolArm64.Memory; using OpenTK.Graphics.OpenGL; -using Ryujinx.Common; using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Memory; using System; @@ -159,7 +158,7 @@ namespace Ryujinx.Graphics.Texture if (!HasDepth(imageFormat) && (rType != gType || rType != bType || rType != aType)) { - throw new NotImplementedException($"Per component types are not implemented!"); + throw new NotImplementedException("Per component types are not implemented!"); } GalImageFormat formatType = convSrgb ? Srgb : GetFormatType(rType); diff --git a/Ryujinx.Graphics/VDec/FFmpeg.cs b/Ryujinx.Graphics/VDec/FFmpeg.cs index 6bec50d79a..ccd01f0d3d 100644 --- a/Ryujinx.Graphics/VDec/FFmpeg.cs +++ b/Ryujinx.Graphics/VDec/FFmpeg.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; namespace Ryujinx.Graphics.VDec { - unsafe static class FFmpegWrapper + static unsafe class FFmpegWrapper { private static AVCodec* _codec; private static AVCodecContext* _context; diff --git a/Ryujinx.Graphics/VDec/H264Decoder.cs b/Ryujinx.Graphics/VDec/H264Decoder.cs index 45a6e24110..01085a733f 100644 --- a/Ryujinx.Graphics/VDec/H264Decoder.cs +++ b/Ryujinx.Graphics/VDec/H264Decoder.cs @@ -15,9 +15,9 @@ namespace Ryujinx.Graphics.VDec private int _numRefIdxL1DefaultActiveMinus1; private bool _deblockingFilterControlPresentFlag; private bool _redundantPicCntPresentFlag; - private bool Transform8x8ModeFlag; + private bool _transform8x8ModeFlag; private bool _mbAdaptiveFrameFieldFlag; - private bool Direct8x8InferenceFlag; + private bool _direct8x8InferenceFlag; private bool _weightedPredFlag; private bool _constrainedIntraPredFlag; private bool _fieldPicFlag; @@ -46,10 +46,10 @@ namespace Ryujinx.Graphics.VDec _numRefIdxL1DefaultActiveMinus1 = Params.NumRefIdxL1DefaultActiveMinus1; _deblockingFilterControlPresentFlag = Params.DeblockingFilterControlPresentFlag; _redundantPicCntPresentFlag = Params.RedundantPicCntPresentFlag; - Transform8x8ModeFlag = Params.Transform8x8ModeFlag; + _transform8x8ModeFlag = Params.Transform8x8ModeFlag; _mbAdaptiveFrameFieldFlag = ((Params.Flags >> 0) & 1) != 0; - Direct8x8InferenceFlag = ((Params.Flags >> 1) & 1) != 0; + _direct8x8InferenceFlag = ((Params.Flags >> 1) & 1) != 0; _weightedPredFlag = ((Params.Flags >> 2) & 1) != 0; _constrainedIntraPredFlag = ((Params.Flags >> 3) & 1) != 0; _fieldPicFlag = ((Params.Flags >> 5) & 1) != 0; @@ -139,7 +139,7 @@ namespace Ryujinx.Graphics.VDec writer.WriteBit(_mbAdaptiveFrameFieldFlag); } - writer.WriteBit(Direct8x8InferenceFlag); + writer.WriteBit(_direct8x8InferenceFlag); writer.WriteBit(false); //Frame cropping flag writer.WriteBit(false); //VUI parameter present flag @@ -167,7 +167,7 @@ namespace Ryujinx.Graphics.VDec writer.WriteBit(_deblockingFilterControlPresentFlag); writer.WriteBit(_constrainedIntraPredFlag); writer.WriteBit(_redundantPicCntPresentFlag); - writer.WriteBit(Transform8x8ModeFlag); + writer.WriteBit(_transform8x8ModeFlag); writer.WriteBit(true); @@ -178,7 +178,7 @@ namespace Ryujinx.Graphics.VDec WriteScalingList(writer, _scalingMatrix4, index * 16, 16); } - if (Transform8x8ModeFlag) + if (_transform8x8ModeFlag) { for (int index = 0; index < 2; index++) { diff --git a/Ryujinx.sln.DotSettings b/Ryujinx.sln.DotSettings index 737b56880c..579d97a459 100644 --- a/Ryujinx.sln.DotSettings +++ b/Ryujinx.sln.DotSettings @@ -4,4 +4,11 @@ UseExplicitType UseExplicitType <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="" Style="AaBb" /></Policy> + True + True + True + True + True + True + True \ No newline at end of file