diff --git a/ChocolArm64/AOpCodeTable.cs b/ChocolArm64/AOpCodeTable.cs index 3500fba0b..5bddc3b99 100644 --- a/ChocolArm64/AOpCodeTable.cs +++ b/ChocolArm64/AOpCodeTable.cs @@ -206,6 +206,7 @@ namespace ChocolArm64 SetA64("0>101110000xxxxx00011101<100000111110xxxxxxxxxx", AInstEmit.Fabs_V, typeof(AOpCodeSimd)); SetA64("000111100x1xxxxx001010xxxxxxxxxx", AInstEmit.Fadd_S, typeof(AOpCodeSimdReg)); SetA64("0>0011100<1xxxxx110101xxxxxxxxxx", AInstEmit.Fadd_V, typeof(AOpCodeSimdReg)); SetA64("0>1011100<1xxxxx110101xxxxxxxxxx", AInstEmit.Faddp_V, typeof(AOpCodeSimdReg)); diff --git a/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs b/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs index 0dfe0bd31..5aea6b045 100644 --- a/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs +++ b/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs @@ -309,6 +309,14 @@ namespace ChocolArm64.Instruction }); } + public static void Fabs_V(AILEmitterCtx Context) + { + EmitVectorUnaryOpF(Context, () => + { + EmitUnaryMathCall(Context, nameof(Math.Abs)); + }); + } + public static void Fadd_S(AILEmitterCtx Context) { if (AOptimizations.UseSse2) diff --git a/README.md b/README.md index 8dd28b2a1..3efd347a8 100644 --- a/README.md +++ b/README.md @@ -59,13 +59,13 @@ If you have some homebrew that currently doesn't work within the emulator, you c **Contact** -For help, support, suggestions, or if you just want to get in touch with the team; join our Discord server! +For help, support, suggestions, or if you just want to get in touch with the team; join our Discord server! https://discord.gg/VkQYXAZ **Running** -To run this emulator, you need the .NET Core 2.0 (or higher) SDK. -Run `dotnet run -c Release -- path\to\homebrew.nro` inside the Ryujinx solution folder to run homebrew apps. +To run this emulator, you need the .NET Core 2.1 (or higher) SDK *and* the OpenAL 11 Core SDK. +Run `dotnet run -c Release -- path\to\homebrew.nro` inside the Ryujinx solution folder to run homebrew apps. Run `dotnet run -c Release -- path\to\game_exefs_and_romfs_folder` to run official games (they need to be decrypted and extracted first!) **Compatibility** @@ -73,5 +73,5 @@ You can check out the compatibility list within the Wiki. Only a handful of game **Latest build** -These builds are compiled automatically for each commit on the master branch. They may be unstable or not work at all. -To download the latest automatic build for Windows (64-bits), [Click Here](https://ci.appveyor.com/api/projects/gdkchan/ryujinx/artifacts/ryujinx_latest_unstable.zip?pr=false). +These builds are compiled automatically for each commit on the master branch. They may be unstable or might not work at all. +The latest automatic build for Windows (64-bit) can be found on the [official website](https://ryujinx.org/#/Build). diff --git a/Ryujinx.Core/OsHle/Services/Nfp/IUser.cs b/Ryujinx.Core/OsHle/Services/Nfp/IUser.cs deleted file mode 100644 index 199d4e151..000000000 --- a/Ryujinx.Core/OsHle/Services/Nfp/IUser.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; -using System.Collections.Generic; - -namespace Ryujinx.Core.OsHle.Services.Nfp -{ - class IUser : IpcService - { - private Dictionary m_Commands; - - public override IReadOnlyDictionary Commands => m_Commands; - - public IUser() - { - m_Commands = new Dictionary() - { - { 0, Initialize } - }; - } - - public long Initialize(ServiceCtx Context) - { - Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); - - return 0; - } - } -} \ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalTextureFormat.cs b/Ryujinx.Graphics/Gal/GalTextureFormat.cs index d61495eb7..7d19dc26d 100644 --- a/Ryujinx.Graphics/Gal/GalTextureFormat.cs +++ b/Ryujinx.Graphics/Gal/GalTextureFormat.cs @@ -8,7 +8,9 @@ namespace Ryujinx.Graphics.Gal R32 = 0xf, A1B5G5R5 = 0x14, B5G6R5 = 0x15, + BC7U = 0x17, G8R8 = 0x18, + R16 = 0x1b, R8 = 0x1d, BC1 = 0x24, BC2 = 0x25, diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs index 2a9641fcb..c8000603a 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs @@ -66,6 +66,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalTextureFormat.A1B5G5R5: return (PixelFormat.Rgba, PixelType.UnsignedShort5551); case GalTextureFormat.B5G6R5: return (PixelFormat.Rgb, PixelType.UnsignedShort565); case GalTextureFormat.G8R8: return (PixelFormat.Rg, PixelType.UnsignedByte); + case GalTextureFormat.R16: return (PixelFormat.Red, PixelType.HalfFloat); case GalTextureFormat.R8: return (PixelFormat.Red, PixelType.UnsignedByte); } @@ -76,11 +77,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL { switch (Format) { - case GalTextureFormat.BC1: return PixelInternalFormat.CompressedRgbaS3tcDxt1Ext; - case GalTextureFormat.BC2: return PixelInternalFormat.CompressedRgbaS3tcDxt3Ext; - case GalTextureFormat.BC3: return PixelInternalFormat.CompressedRgbaS3tcDxt5Ext; - case GalTextureFormat.BC4: return PixelInternalFormat.CompressedRedRgtc1; - case GalTextureFormat.BC5: return PixelInternalFormat.CompressedRgRgtc2; + case GalTextureFormat.BC7U: return PixelInternalFormat.CompressedRgbaBptcUnorm; + case GalTextureFormat.BC1: return PixelInternalFormat.CompressedRgbaS3tcDxt1Ext; + case GalTextureFormat.BC2: return PixelInternalFormat.CompressedRgbaS3tcDxt3Ext; + case GalTextureFormat.BC3: return PixelInternalFormat.CompressedRgbaS3tcDxt5Ext; + case GalTextureFormat.BC4: return PixelInternalFormat.CompressedRedRgtc1; + case GalTextureFormat.BC5: return PixelInternalFormat.CompressedRgRgtc2; } throw new NotImplementedException(Format.ToString()); diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs index 540e47359..d81fcc488 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs @@ -202,6 +202,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL { switch (Format) { + case GalTextureFormat.BC7U: case GalTextureFormat.BC1: case GalTextureFormat.BC2: case GalTextureFormat.BC3: diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs index 43a04813c..4002c29a5 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs @@ -159,7 +159,8 @@ namespace Ryujinx.Graphics.Gal.Shader case ShaderIrOperAbuf Abuf: { //This is a built-in input variable. - if (Abuf.Offs == VertexIdAttr) + if (Abuf.Offs == VertexIdAttr || + Abuf.Offs == InstanceIdAttr) { break; } diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs index 71a53a5a3..1bcedacba 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs @@ -975,7 +975,8 @@ namespace Ryujinx.Graphics.Gal.Shader switch (Node) { case ShaderIrOperAbuf Abuf: - return Abuf.Offs == GlslDecl.VertexIdAttr + return Abuf.Offs == GlslDecl.VertexIdAttr || + Abuf.Offs == GlslDecl.InstanceIdAttr ? OperType.I32 : OperType.F32; diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs index 3299ebab6..a8ad5ec2e 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs @@ -14,7 +14,7 @@ namespace Ryujinx.Graphics.Gal.Shader for (int Index = 0; Index <= Size; Index++) { - Opers[Index] = new ShaderIrOperAbuf(Abuf, Reg); + Opers[Index] = new ShaderIrOperAbuf(Abuf + Index * 4, Reg); } return Opers; diff --git a/Ryujinx.Core/Gpu/BlockLinearSwizzle.cs b/Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs similarity index 98% rename from Ryujinx.Core/Gpu/BlockLinearSwizzle.cs rename to Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs index 1b6044308..366f57403 100644 --- a/Ryujinx.Core/Gpu/BlockLinearSwizzle.cs +++ b/Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class BlockLinearSwizzle : ISwizzle { diff --git a/Ryujinx.Core/Gpu/INvGpuEngine.cs b/Ryujinx.HLE/Gpu/INvGpuEngine.cs similarity index 83% rename from Ryujinx.Core/Gpu/INvGpuEngine.cs rename to Ryujinx.HLE/Gpu/INvGpuEngine.cs index 865ea8ba8..62307f582 100644 --- a/Ryujinx.Core/Gpu/INvGpuEngine.cs +++ b/Ryujinx.HLE/Gpu/INvGpuEngine.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { interface INvGpuEngine { diff --git a/Ryujinx.Core/Gpu/ISwizzle.cs b/Ryujinx.HLE/Gpu/ISwizzle.cs similarity index 75% rename from Ryujinx.Core/Gpu/ISwizzle.cs rename to Ryujinx.HLE/Gpu/ISwizzle.cs index f475be6ef..525707ba7 100644 --- a/Ryujinx.Core/Gpu/ISwizzle.cs +++ b/Ryujinx.HLE/Gpu/ISwizzle.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { interface ISwizzle { diff --git a/Ryujinx.Core/Gpu/LinearSwizzle.cs b/Ryujinx.HLE/Gpu/LinearSwizzle.cs similarity index 92% rename from Ryujinx.Core/Gpu/LinearSwizzle.cs rename to Ryujinx.HLE/Gpu/LinearSwizzle.cs index 5f8dfddee..995866ad6 100644 --- a/Ryujinx.Core/Gpu/LinearSwizzle.cs +++ b/Ryujinx.HLE/Gpu/LinearSwizzle.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class LinearSwizzle : ISwizzle { diff --git a/Ryujinx.Core/Gpu/MacroInterpreter.cs b/Ryujinx.HLE/Gpu/MacroInterpreter.cs similarity index 99% rename from Ryujinx.Core/Gpu/MacroInterpreter.cs rename to Ryujinx.HLE/Gpu/MacroInterpreter.cs index b799f98fa..58a236ad3 100644 --- a/Ryujinx.Core/Gpu/MacroInterpreter.cs +++ b/Ryujinx.HLE/Gpu/MacroInterpreter.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class MacroInterpreter { diff --git a/Ryujinx.Core/Gpu/NvGpu.cs b/Ryujinx.HLE/Gpu/NvGpu.cs similarity index 97% rename from Ryujinx.Core/Gpu/NvGpu.cs rename to Ryujinx.HLE/Gpu/NvGpu.cs index 0fca7b992..1e433fa4b 100644 --- a/Ryujinx.Core/Gpu/NvGpu.cs +++ b/Ryujinx.HLE/Gpu/NvGpu.cs @@ -1,7 +1,7 @@ using Ryujinx.Graphics.Gal; using System.Threading; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpu { diff --git a/Ryujinx.Core/Gpu/NvGpuBufferType.cs b/Ryujinx.HLE/Gpu/NvGpuBufferType.cs similarity index 76% rename from Ryujinx.Core/Gpu/NvGpuBufferType.cs rename to Ryujinx.HLE/Gpu/NvGpuBufferType.cs index 6c4e7d10b..a44a772db 100644 --- a/Ryujinx.Core/Gpu/NvGpuBufferType.cs +++ b/Ryujinx.HLE/Gpu/NvGpuBufferType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum NvGpuBufferType { diff --git a/Ryujinx.Core/Gpu/NvGpuEngine.cs b/Ryujinx.HLE/Gpu/NvGpuEngine.cs similarity index 85% rename from Ryujinx.Core/Gpu/NvGpuEngine.cs rename to Ryujinx.HLE/Gpu/NvGpuEngine.cs index ee0420f70..41697ed69 100644 --- a/Ryujinx.Core/Gpu/NvGpuEngine.cs +++ b/Ryujinx.HLE/Gpu/NvGpuEngine.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum NvGpuEngine { diff --git a/Ryujinx.Core/Gpu/NvGpuEngine2d.cs b/Ryujinx.HLE/Gpu/NvGpuEngine2d.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuEngine2d.cs rename to Ryujinx.HLE/Gpu/NvGpuEngine2d.cs index fd19bc54f..15667eeb2 100644 --- a/Ryujinx.Core/Gpu/NvGpuEngine2d.cs +++ b/Ryujinx.HLE/Gpu/NvGpuEngine2d.cs @@ -1,7 +1,7 @@ using Ryujinx.Graphics.Gal; using System.Collections.Generic; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpuEngine2d : INvGpuEngine { diff --git a/Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs b/Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs similarity index 96% rename from Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs rename to Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs index b4abad00d..1039e3680 100644 --- a/Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs +++ b/Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum NvGpuEngine2dReg { diff --git a/Ryujinx.Core/Gpu/NvGpuEngine3d.cs b/Ryujinx.HLE/Gpu/NvGpuEngine3d.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuEngine3d.cs rename to Ryujinx.HLE/Gpu/NvGpuEngine3d.cs index 76d21f12c..b3f1330b7 100644 --- a/Ryujinx.Core/Gpu/NvGpuEngine3d.cs +++ b/Ryujinx.HLE/Gpu/NvGpuEngine3d.cs @@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal; using System; using System.Collections.Generic; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpuEngine3d : INvGpuEngine { diff --git a/Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs b/Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs similarity index 98% rename from Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs rename to Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs index 823885ffd..e0de4777d 100644 --- a/Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs +++ b/Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum NvGpuEngine3dReg { diff --git a/Ryujinx.Core/Gpu/NvGpuFifo.cs b/Ryujinx.HLE/Gpu/NvGpuFifo.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuFifo.cs rename to Ryujinx.HLE/Gpu/NvGpuFifo.cs index 6a309b182..0df37edc7 100644 --- a/Ryujinx.Core/Gpu/NvGpuFifo.cs +++ b/Ryujinx.HLE/Gpu/NvGpuFifo.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpuFifo { diff --git a/Ryujinx.Core/Gpu/NvGpuFifoMeth.cs b/Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs similarity index 89% rename from Ryujinx.Core/Gpu/NvGpuFifoMeth.cs rename to Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs index 78ec90802..247a7bfc4 100644 --- a/Ryujinx.Core/Gpu/NvGpuFifoMeth.cs +++ b/Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum NvGpuFifoMeth { diff --git a/Ryujinx.Core/Gpu/NvGpuMethod.cs b/Ryujinx.HLE/Gpu/NvGpuMethod.cs similarity index 72% rename from Ryujinx.Core/Gpu/NvGpuMethod.cs rename to Ryujinx.HLE/Gpu/NvGpuMethod.cs index 42e1b5537..f7ff66475 100644 --- a/Ryujinx.Core/Gpu/NvGpuMethod.cs +++ b/Ryujinx.HLE/Gpu/NvGpuMethod.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry); } \ No newline at end of file diff --git a/Ryujinx.Core/Gpu/NvGpuPBEntry.cs b/Ryujinx.HLE/Gpu/NvGpuPBEntry.cs similarity index 95% rename from Ryujinx.Core/Gpu/NvGpuPBEntry.cs rename to Ryujinx.HLE/Gpu/NvGpuPBEntry.cs index d640656bd..2cd663fed 100644 --- a/Ryujinx.Core/Gpu/NvGpuPBEntry.cs +++ b/Ryujinx.HLE/Gpu/NvGpuPBEntry.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { struct NvGpuPBEntry { diff --git a/Ryujinx.Core/Gpu/NvGpuPushBuffer.cs b/Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuPushBuffer.cs rename to Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs index 867bbe987..2d4f0c1ac 100644 --- a/Ryujinx.Core/Gpu/NvGpuPushBuffer.cs +++ b/Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { static class NvGpuPushBuffer { diff --git a/Ryujinx.Core/Gpu/NvGpuVmm.cs b/Ryujinx.HLE/Gpu/NvGpuVmm.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuVmm.cs rename to Ryujinx.HLE/Gpu/NvGpuVmm.cs index 98b624d81..b0ba3e90b 100644 --- a/Ryujinx.Core/Gpu/NvGpuVmm.cs +++ b/Ryujinx.HLE/Gpu/NvGpuVmm.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using Ryujinx.Graphics.Gal; using System.Collections.Concurrent; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpuVmm : IAMemory, IGalMemory { diff --git a/Ryujinx.Core/Gpu/NvGpuVmmCache.cs b/Ryujinx.HLE/Gpu/NvGpuVmmCache.cs similarity index 99% rename from Ryujinx.Core/Gpu/NvGpuVmmCache.cs rename to Ryujinx.HLE/Gpu/NvGpuVmmCache.cs index 753118e95..38b25e4fc 100644 --- a/Ryujinx.Core/Gpu/NvGpuVmmCache.cs +++ b/Ryujinx.HLE/Gpu/NvGpuVmmCache.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using System; using System.Collections.Generic; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { class NvGpuVmmCache { diff --git a/Ryujinx.Core/Gpu/Texture.cs b/Ryujinx.HLE/Gpu/Texture.cs similarity index 98% rename from Ryujinx.Core/Gpu/Texture.cs rename to Ryujinx.HLE/Gpu/Texture.cs index 022df83fe..1de7f302c 100644 --- a/Ryujinx.Core/Gpu/Texture.cs +++ b/Ryujinx.HLE/Gpu/Texture.cs @@ -1,6 +1,6 @@ using Ryujinx.Graphics.Gal; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { struct Texture { diff --git a/Ryujinx.Core/Gpu/TextureFactory.cs b/Ryujinx.HLE/Gpu/TextureFactory.cs similarity index 99% rename from Ryujinx.Core/Gpu/TextureFactory.cs rename to Ryujinx.HLE/Gpu/TextureFactory.cs index 9262b9478..9a92a0167 100644 --- a/Ryujinx.Core/Gpu/TextureFactory.cs +++ b/Ryujinx.HLE/Gpu/TextureFactory.cs @@ -1,7 +1,7 @@ using Ryujinx.Graphics.Gal; using System; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { static class TextureFactory { diff --git a/Ryujinx.Core/Gpu/TextureHelper.cs b/Ryujinx.HLE/Gpu/TextureHelper.cs similarity index 94% rename from Ryujinx.Core/Gpu/TextureHelper.cs rename to Ryujinx.HLE/Gpu/TextureHelper.cs index 1863bb777..e48e25ad8 100644 --- a/Ryujinx.Core/Gpu/TextureHelper.cs +++ b/Ryujinx.HLE/Gpu/TextureHelper.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using Ryujinx.Graphics.Gal; using System; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { static class TextureHelper { @@ -33,6 +33,7 @@ namespace Ryujinx.Core.Gpu case GalTextureFormat.A1B5G5R5: return Texture.Width * Texture.Height * 2; case GalTextureFormat.B5G6R5: return Texture.Width * Texture.Height * 2; case GalTextureFormat.G8R8: return Texture.Width * Texture.Height * 2; + case GalTextureFormat.R16: return Texture.Width * Texture.Height * 2; case GalTextureFormat.R8: return Texture.Width * Texture.Height; case GalTextureFormat.BC1: @@ -44,6 +45,7 @@ namespace Ryujinx.Core.Gpu return W * H * 8; } + case GalTextureFormat.BC7U: case GalTextureFormat.BC2: case GalTextureFormat.BC3: case GalTextureFormat.BC5: diff --git a/Ryujinx.Core/Gpu/TextureReader.cs b/Ryujinx.HLE/Gpu/TextureReader.cs similarity index 98% rename from Ryujinx.Core/Gpu/TextureReader.cs rename to Ryujinx.HLE/Gpu/TextureReader.cs index acd17c5dc..9e9ff7834 100644 --- a/Ryujinx.Core/Gpu/TextureReader.cs +++ b/Ryujinx.HLE/Gpu/TextureReader.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using Ryujinx.Graphics.Gal; using System; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { static class TextureReader { @@ -17,7 +17,9 @@ namespace Ryujinx.Core.Gpu case GalTextureFormat.A1B5G5R5: return Read5551 (Memory, Texture); case GalTextureFormat.B5G6R5: return Read565 (Memory, Texture); case GalTextureFormat.G8R8: return Read2Bpp (Memory, Texture); + case GalTextureFormat.R16: return Read2Bpp (Memory, Texture); case GalTextureFormat.R8: return Read1Bpp (Memory, Texture); + case GalTextureFormat.BC7U: return Read16Bpt4x4(Memory, Texture); case GalTextureFormat.BC1: return Read8Bpt4x4 (Memory, Texture); case GalTextureFormat.BC2: return Read16Bpt4x4(Memory, Texture); case GalTextureFormat.BC3: return Read16Bpt4x4(Memory, Texture); diff --git a/Ryujinx.Core/Gpu/TextureSwizzle.cs b/Ryujinx.HLE/Gpu/TextureSwizzle.cs similarity index 88% rename from Ryujinx.Core/Gpu/TextureSwizzle.cs rename to Ryujinx.HLE/Gpu/TextureSwizzle.cs index fbca40e12..5e32f4c75 100644 --- a/Ryujinx.Core/Gpu/TextureSwizzle.cs +++ b/Ryujinx.HLE/Gpu/TextureSwizzle.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { enum TextureSwizzle { diff --git a/Ryujinx.Core/Gpu/TextureWriter.cs b/Ryujinx.HLE/Gpu/TextureWriter.cs similarity index 98% rename from Ryujinx.Core/Gpu/TextureWriter.cs rename to Ryujinx.HLE/Gpu/TextureWriter.cs index 5633614fb..ad92961c6 100644 --- a/Ryujinx.Core/Gpu/TextureWriter.cs +++ b/Ryujinx.HLE/Gpu/TextureWriter.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using Ryujinx.Graphics.Gal; using System; -namespace Ryujinx.Core.Gpu +namespace Ryujinx.HLE.Gpu { static class TextureWriter { diff --git a/Ryujinx.Core/Hid/Hid.cs b/Ryujinx.HLE/Hid/Hid.cs similarity index 92% rename from Ryujinx.Core/Hid/Hid.cs rename to Ryujinx.HLE/Hid/Hid.cs index 6cda63992..2f007f1fb 100644 --- a/Ryujinx.Core/Hid/Hid.cs +++ b/Ryujinx.HLE/Hid/Hid.cs @@ -1,9 +1,10 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle; +using Ryujinx.HLE.OsHle.Handles; using System; -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public class Hid { @@ -85,11 +86,16 @@ namespace Ryujinx.Core.Input { ShMemPositions = SharedMem.GetVirtualPositions(); - (AMemory Memory, long Position) ShMem = ShMemPositions[ShMemPositions.Length - 1]; + (AMemory Memory, long Position) = ShMemPositions[ShMemPositions.Length - 1]; - Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{ShMem.Position:x16}!"); + for (long Offset = 0; Offset < Horizon.HidSize; Offset += 8) + { + Memory.WriteInt64Unchecked(Position + Offset, 0); + } - Init(ShMem.Memory, ShMem.Position); + Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{Position:x16}!"); + + Init(Memory, Position); } } @@ -124,9 +130,7 @@ namespace Ryujinx.Core.Input { long BaseControllerOffset = Position + HidControllersOffset + 8 * HidControllerSize; - HidControllerType Type = - HidControllerType.ControllerType_Handheld | - HidControllerType.ControllerType_JoyconPair; + HidControllerType Type = HidControllerType.ControllerType_Handheld; bool IsHalf = false; @@ -186,18 +190,22 @@ namespace Ryujinx.Core.Input ControllerOffset += HidControllersLayoutHeaderSize; + long LastEntryOffset = ControllerOffset + LastEntry * HidControllersInputEntrySize; + ControllerOffset += CurrEntry * HidControllersInputEntrySize; - Memory.WriteInt64Unchecked(ControllerOffset + 0x0, Timestamp); - Memory.WriteInt64Unchecked(ControllerOffset + 0x8, Timestamp); + long SampleCounter = Memory.ReadInt64Unchecked(LastEntryOffset) + 1; + + Memory.WriteInt64Unchecked(ControllerOffset + 0x0, SampleCounter); + Memory.WriteInt64Unchecked(ControllerOffset + 0x8, SampleCounter); Memory.WriteInt64Unchecked(ControllerOffset + 0x10, (uint)Buttons); Memory.WriteInt32Unchecked(ControllerOffset + 0x18, LeftStick.DX); Memory.WriteInt32Unchecked(ControllerOffset + 0x1c, LeftStick.DY); - Memory.WriteInt64Unchecked(ControllerOffset + 0x20, RightStick.DX); - Memory.WriteInt64Unchecked(ControllerOffset + 0x24, RightStick.DY); + Memory.WriteInt32Unchecked(ControllerOffset + 0x20, RightStick.DX); + Memory.WriteInt32Unchecked(ControllerOffset + 0x24, RightStick.DY); Memory.WriteInt64Unchecked(ControllerOffset + 0x28, (uint)HidControllerConnState.Controller_State_Connected | @@ -266,4 +274,4 @@ namespace Ryujinx.Core.Input return (long)((ulong)Environment.TickCount * 19_200); } } -} \ No newline at end of file +} diff --git a/Ryujinx.Core/Hid/HidControllerButtons.cs b/Ryujinx.HLE/Hid/HidControllerButtons.cs similarity index 97% rename from Ryujinx.Core/Hid/HidControllerButtons.cs rename to Ryujinx.HLE/Hid/HidControllerButtons.cs index 65eb3f82f..f41d17e1d 100644 --- a/Ryujinx.Core/Hid/HidControllerButtons.cs +++ b/Ryujinx.HLE/Hid/HidControllerButtons.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { [Flags] public enum HidControllerButtons diff --git a/Ryujinx.Core/Hid/HidControllerColorDesc.cs b/Ryujinx.HLE/Hid/HidControllerColorDesc.cs similarity index 81% rename from Ryujinx.Core/Hid/HidControllerColorDesc.cs rename to Ryujinx.HLE/Hid/HidControllerColorDesc.cs index fc7fa2178..b8cf2a5e9 100644 --- a/Ryujinx.Core/Hid/HidControllerColorDesc.cs +++ b/Ryujinx.HLE/Hid/HidControllerColorDesc.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { [Flags] public enum HidControllerColorDesc diff --git a/Ryujinx.Core/Hid/HidControllerConnState.cs b/Ryujinx.HLE/Hid/HidControllerConnState.cs similarity index 85% rename from Ryujinx.Core/Hid/HidControllerConnState.cs rename to Ryujinx.HLE/Hid/HidControllerConnState.cs index 7f47a7f92..1fc9482a0 100644 --- a/Ryujinx.Core/Hid/HidControllerConnState.cs +++ b/Ryujinx.HLE/Hid/HidControllerConnState.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { [Flags] public enum HidControllerConnState diff --git a/Ryujinx.Core/Hid/HidControllerId.cs b/Ryujinx.HLE/Hid/HidControllerId.cs similarity index 92% rename from Ryujinx.Core/Hid/HidControllerId.cs rename to Ryujinx.HLE/Hid/HidControllerId.cs index 84b68d27e..e4a0e26cb 100644 --- a/Ryujinx.Core/Hid/HidControllerId.cs +++ b/Ryujinx.HLE/Hid/HidControllerId.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public enum HidControllerId { diff --git a/Ryujinx.Core/Hid/HidControllerLayouts.cs b/Ryujinx.HLE/Hid/HidControllerLayouts.cs similarity index 89% rename from Ryujinx.Core/Hid/HidControllerLayouts.cs rename to Ryujinx.HLE/Hid/HidControllerLayouts.cs index e04c40b2d..39fdd3feb 100644 --- a/Ryujinx.Core/Hid/HidControllerLayouts.cs +++ b/Ryujinx.HLE/Hid/HidControllerLayouts.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public enum HidControllerLayouts { diff --git a/Ryujinx.Core/Hid/HidControllerType.cs b/Ryujinx.HLE/Hid/HidControllerType.cs similarity index 91% rename from Ryujinx.Core/Hid/HidControllerType.cs rename to Ryujinx.HLE/Hid/HidControllerType.cs index a4eb674c8..ea8ddfd4e 100644 --- a/Ryujinx.Core/Hid/HidControllerType.cs +++ b/Ryujinx.HLE/Hid/HidControllerType.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { [Flags] public enum HidControllerType diff --git a/Ryujinx.Core/Hid/HidJoystickPosition.cs b/Ryujinx.HLE/Hid/HidJoystickPosition.cs similarity index 77% rename from Ryujinx.Core/Hid/HidJoystickPosition.cs rename to Ryujinx.HLE/Hid/HidJoystickPosition.cs index 61f8189f4..a06ef7b2c 100644 --- a/Ryujinx.Core/Hid/HidJoystickPosition.cs +++ b/Ryujinx.HLE/Hid/HidJoystickPosition.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public struct HidJoystickPosition { diff --git a/Ryujinx.Core/Hid/HidTouchPoint.cs b/Ryujinx.HLE/Hid/HidTouchPoint.cs similarity index 85% rename from Ryujinx.Core/Hid/HidTouchPoint.cs rename to Ryujinx.HLE/Hid/HidTouchPoint.cs index 1207e1d53..25412456b 100644 --- a/Ryujinx.Core/Hid/HidTouchPoint.cs +++ b/Ryujinx.HLE/Hid/HidTouchPoint.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public struct HidTouchPoint { diff --git a/Ryujinx.Core/Hid/JoyCon.cs b/Ryujinx.HLE/Hid/JoyCon.cs similarity index 97% rename from Ryujinx.Core/Hid/JoyCon.cs rename to Ryujinx.HLE/Hid/JoyCon.cs index 1aef82fe0..e45e1a47e 100644 --- a/Ryujinx.Core/Hid/JoyCon.cs +++ b/Ryujinx.HLE/Hid/JoyCon.cs @@ -1,5 +1,5 @@ //TODO: This is only used by Config, it doesn't belong to Core. -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public struct JoyConLeft { diff --git a/Ryujinx.Core/Hid/JoyConColor.cs b/Ryujinx.HLE/Hid/JoyConColor.cs similarity index 95% rename from Ryujinx.Core/Hid/JoyConColor.cs rename to Ryujinx.HLE/Hid/JoyConColor.cs index 21d89fe42..514ec21b0 100644 --- a/Ryujinx.Core/Hid/JoyConColor.cs +++ b/Ryujinx.HLE/Hid/JoyConColor.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Input +namespace Ryujinx.HLE.Input { public enum JoyConColor //Thanks to CTCaer { diff --git a/Ryujinx.Core/Loaders/Compression/Lz4.cs b/Ryujinx.HLE/Loaders/Compression/Lz4.cs similarity index 97% rename from Ryujinx.Core/Loaders/Compression/Lz4.cs rename to Ryujinx.HLE/Loaders/Compression/Lz4.cs index eb1602a09..cfb495517 100644 --- a/Ryujinx.Core/Loaders/Compression/Lz4.cs +++ b/Ryujinx.HLE/Loaders/Compression/Lz4.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Loaders.Compression +namespace Ryujinx.HLE.Loaders.Compression { static class Lz4 { diff --git a/Ryujinx.Core/Loaders/ElfDyn.cs b/Ryujinx.HLE/Loaders/ElfDyn.cs similarity index 89% rename from Ryujinx.Core/Loaders/ElfDyn.cs rename to Ryujinx.HLE/Loaders/ElfDyn.cs index 2ed50b3e6..3508e6e4e 100644 --- a/Ryujinx.Core/Loaders/ElfDyn.cs +++ b/Ryujinx.HLE/Loaders/ElfDyn.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { struct ElfDyn { diff --git a/Ryujinx.Core/Loaders/ElfDynTag.cs b/Ryujinx.HLE/Loaders/ElfDynTag.cs similarity index 98% rename from Ryujinx.Core/Loaders/ElfDynTag.cs rename to Ryujinx.HLE/Loaders/ElfDynTag.cs index 1616c2238..5915d4d12 100644 --- a/Ryujinx.Core/Loaders/ElfDynTag.cs +++ b/Ryujinx.HLE/Loaders/ElfDynTag.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { enum ElfDynTag { diff --git a/Ryujinx.Core/Loaders/ElfRel.cs b/Ryujinx.HLE/Loaders/ElfRel.cs similarity index 93% rename from Ryujinx.Core/Loaders/ElfRel.cs rename to Ryujinx.HLE/Loaders/ElfRel.cs index 8db274524..cfc31d891 100644 --- a/Ryujinx.Core/Loaders/ElfRel.cs +++ b/Ryujinx.HLE/Loaders/ElfRel.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { struct ElfRel { diff --git a/Ryujinx.Core/Loaders/ElfRelType.cs b/Ryujinx.HLE/Loaders/ElfRelType.cs similarity index 99% rename from Ryujinx.Core/Loaders/ElfRelType.cs rename to Ryujinx.HLE/Loaders/ElfRelType.cs index a05331388..7da5eec36 100644 --- a/Ryujinx.Core/Loaders/ElfRelType.cs +++ b/Ryujinx.HLE/Loaders/ElfRelType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { enum ElfRelType { diff --git a/Ryujinx.Core/Loaders/ElfSym.cs b/Ryujinx.HLE/Loaders/ElfSym.cs similarity index 92% rename from Ryujinx.Core/Loaders/ElfSym.cs rename to Ryujinx.HLE/Loaders/ElfSym.cs index 89e7c61f6..869938d35 100644 --- a/Ryujinx.Core/Loaders/ElfSym.cs +++ b/Ryujinx.HLE/Loaders/ElfSym.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { struct ElfSym { @@ -12,7 +12,7 @@ namespace Ryujinx.Core.Loaders Type == ElfSymType.STT_FUNC || Type == ElfSymType.STT_OBJECT; - public bool IsGlobalOrWeak => + public bool IsGlobalOrWeak => Binding == ElfSymBinding.STB_GLOBAL || Binding == ElfSymBinding.STB_WEAK; @@ -22,7 +22,7 @@ namespace Ryujinx.Core.Loaders public ElfSym( string Name, - int Info, + int Info, int Other, int SHIdx, long Value, diff --git a/Ryujinx.Core/Loaders/ElfSymBinding.cs b/Ryujinx.HLE/Loaders/ElfSymBinding.cs similarity index 77% rename from Ryujinx.Core/Loaders/ElfSymBinding.cs rename to Ryujinx.HLE/Loaders/ElfSymBinding.cs index c87894962..f1d249ec2 100644 --- a/Ryujinx.Core/Loaders/ElfSymBinding.cs +++ b/Ryujinx.HLE/Loaders/ElfSymBinding.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { enum ElfSymBinding { diff --git a/Ryujinx.Core/Loaders/ElfSymType.cs b/Ryujinx.HLE/Loaders/ElfSymType.cs similarity index 87% rename from Ryujinx.Core/Loaders/ElfSymType.cs rename to Ryujinx.HLE/Loaders/ElfSymType.cs index 786395e62..478064bc4 100644 --- a/Ryujinx.Core/Loaders/ElfSymType.cs +++ b/Ryujinx.HLE/Loaders/ElfSymType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { enum ElfSymType { diff --git a/Ryujinx.Core/Loaders/ElfSymVisibility.cs b/Ryujinx.HLE/Loaders/ElfSymVisibility.cs similarity index 67% rename from Ryujinx.Core/Loaders/ElfSymVisibility.cs rename to Ryujinx.HLE/Loaders/ElfSymVisibility.cs index e72eb5b83..fe7243a7a 100644 --- a/Ryujinx.Core/Loaders/ElfSymVisibility.cs +++ b/Ryujinx.HLE/Loaders/ElfSymVisibility.cs @@ -1,10 +1,10 @@ -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { enum ElfSymVisibility { STV_DEFAULT = 0, STV_INTERNAL = 1, STV_HIDDEN = 2, - STV_PROTECTED = 3 + STV_PROTECTED = 3 } } \ No newline at end of file diff --git a/Ryujinx.Core/Loaders/Executable.cs b/Ryujinx.HLE/Loaders/Executable.cs similarity index 98% rename from Ryujinx.Core/Loaders/Executable.cs rename to Ryujinx.HLE/Loaders/Executable.cs index 213679a53..618ee241a 100644 --- a/Ryujinx.Core/Loaders/Executable.cs +++ b/Ryujinx.HLE/Loaders/Executable.cs @@ -1,9 +1,9 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Loaders.Executables; -using Ryujinx.Core.OsHle; +using Ryujinx.HLE.Loaders.Executables; +using Ryujinx.HLE.OsHle; using System.Collections.Generic; -namespace Ryujinx.Core.Loaders +namespace Ryujinx.HLE.Loaders { class Executable { diff --git a/Ryujinx.Core/Loaders/Executables/IExecutable.cs b/Ryujinx.HLE/Loaders/Executables/IExecutable.cs similarity index 88% rename from Ryujinx.Core/Loaders/Executables/IExecutable.cs rename to Ryujinx.HLE/Loaders/Executables/IExecutable.cs index 412058d88..1e8e569a5 100644 --- a/Ryujinx.Core/Loaders/Executables/IExecutable.cs +++ b/Ryujinx.HLE/Loaders/Executables/IExecutable.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Loaders.Executables +namespace Ryujinx.HLE.Loaders.Executables { public interface IExecutable { diff --git a/Ryujinx.Core/Loaders/Executables/Nro.cs b/Ryujinx.HLE/Loaders/Executables/Nro.cs similarity index 97% rename from Ryujinx.Core/Loaders/Executables/Nro.cs rename to Ryujinx.HLE/Loaders/Executables/Nro.cs index c3411d226..9e2b7e907 100644 --- a/Ryujinx.Core/Loaders/Executables/Nro.cs +++ b/Ryujinx.HLE/Loaders/Executables/Nro.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.Loaders.Executables +namespace Ryujinx.HLE.Loaders.Executables { class Nro : IExecutable { diff --git a/Ryujinx.Core/Loaders/Executables/Nso.cs b/Ryujinx.HLE/Loaders/Executables/Nso.cs similarity index 97% rename from Ryujinx.Core/Loaders/Executables/Nso.cs rename to Ryujinx.HLE/Loaders/Executables/Nso.cs index bfe159d7c..a5e1a361e 100644 --- a/Ryujinx.Core/Loaders/Executables/Nso.cs +++ b/Ryujinx.HLE/Loaders/Executables/Nso.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Loaders.Compression; +using Ryujinx.HLE.Loaders.Compression; using System; using System.IO; -namespace Ryujinx.Core.Loaders.Executables +namespace Ryujinx.HLE.Loaders.Executables { class Nso : IExecutable { diff --git a/Ryujinx.Core/Logging/LogClass.cs b/Ryujinx.HLE/Logging/LogClass.cs similarity index 95% rename from Ryujinx.Core/Logging/LogClass.cs rename to Ryujinx.HLE/Logging/LogClass.cs index d26855d00..c377ace66 100644 --- a/Ryujinx.Core/Logging/LogClass.cs +++ b/Ryujinx.HLE/Logging/LogClass.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Logging +namespace Ryujinx.HLE.Logging { public enum LogClass { diff --git a/Ryujinx.Core/Logging/LogEventArgs.cs b/Ryujinx.HLE/Logging/LogEventArgs.cs similarity index 93% rename from Ryujinx.Core/Logging/LogEventArgs.cs rename to Ryujinx.HLE/Logging/LogEventArgs.cs index 15d5aefbb..647cf7131 100644 --- a/Ryujinx.Core/Logging/LogEventArgs.cs +++ b/Ryujinx.HLE/Logging/LogEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.Logging +namespace Ryujinx.HLE.Logging { public class LogEventArgs : EventArgs { diff --git a/Ryujinx.Core/Logging/LogLevel.cs b/Ryujinx.HLE/Logging/LogLevel.cs similarity index 78% rename from Ryujinx.Core/Logging/LogLevel.cs rename to Ryujinx.HLE/Logging/LogLevel.cs index be5b4ff2b..971333e60 100644 --- a/Ryujinx.Core/Logging/LogLevel.cs +++ b/Ryujinx.HLE/Logging/LogLevel.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Logging +namespace Ryujinx.HLE.Logging { public enum LogLevel { diff --git a/Ryujinx.Core/Logging/Logger.cs b/Ryujinx.HLE/Logging/Logger.cs similarity index 98% rename from Ryujinx.Core/Logging/Logger.cs rename to Ryujinx.HLE/Logging/Logger.cs index 972d716cc..5376b253a 100644 --- a/Ryujinx.Core/Logging/Logger.cs +++ b/Ryujinx.HLE/Logging/Logger.cs @@ -2,7 +2,7 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; -namespace Ryujinx.Core.Logging +namespace Ryujinx.HLE.Logging { public class Logger { diff --git a/Ryujinx.Core/OsHle/AppletStateMgr.cs b/Ryujinx.HLE/OsHle/AppletStateMgr.cs similarity index 92% rename from Ryujinx.Core/OsHle/AppletStateMgr.cs rename to Ryujinx.HLE/OsHle/AppletStateMgr.cs index 2199f43ee..5fdb53433 100644 --- a/Ryujinx.Core/OsHle/AppletStateMgr.cs +++ b/Ryujinx.HLE/OsHle/AppletStateMgr.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Services.Am; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Services.Am; using System; using System.Collections.Concurrent; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class AppletStateMgr : IDisposable { diff --git a/Ryujinx.Core/OsHle/Diagnostics/Demangler.cs b/Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs similarity index 99% rename from Ryujinx.Core/OsHle/Diagnostics/Demangler.cs rename to Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs index be04858d0..6646dede6 100644 --- a/Ryujinx.Core/OsHle/Diagnostics/Demangler.cs +++ b/Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Ryujinx.Core.OsHle.Diagnostics +namespace Ryujinx.HLE.OsHle.Diagnostics { static class Demangler { diff --git a/Ryujinx.Core/OsHle/ErrorCode.cs b/Ryujinx.HLE/OsHle/ErrorCode.cs similarity index 86% rename from Ryujinx.Core/OsHle/ErrorCode.cs rename to Ryujinx.HLE/OsHle/ErrorCode.cs index 4210b2300..1e07f9b24 100644 --- a/Ryujinx.Core/OsHle/ErrorCode.cs +++ b/Ryujinx.HLE/OsHle/ErrorCode.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { static class ErrorCode { diff --git a/Ryujinx.Core/OsHle/ErrorModule.cs b/Ryujinx.HLE/OsHle/ErrorModule.cs similarity index 99% rename from Ryujinx.Core/OsHle/ErrorModule.cs rename to Ryujinx.HLE/OsHle/ErrorModule.cs index 1b5df0cff..924ee9516 100644 --- a/Ryujinx.Core/OsHle/ErrorModule.cs +++ b/Ryujinx.HLE/OsHle/ErrorModule.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { enum ErrorModule { diff --git a/Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs b/Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs similarity index 85% rename from Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs rename to Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs index db4929c5b..2ed7f19e3 100644 --- a/Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs +++ b/Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.OsHle.Exceptions +namespace Ryujinx.HLE.OsHle.Exceptions { public class GuestBrokeExecutionException : Exception { diff --git a/Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs b/Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs similarity index 90% rename from Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs rename to Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs index 20cf83862..d9f0b8cf9 100644 --- a/Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs +++ b/Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.OsHle.Exceptions +namespace Ryujinx.HLE.OsHle.Exceptions { public class UndefinedInstructionException : Exception { diff --git a/Ryujinx.Core/OsHle/GlobalStateTable.cs b/Ryujinx.HLE/OsHle/GlobalStateTable.cs similarity index 98% rename from Ryujinx.Core/OsHle/GlobalStateTable.cs rename to Ryujinx.HLE/OsHle/GlobalStateTable.cs index 2a5714ad0..fb71e46b9 100644 --- a/Ryujinx.Core/OsHle/GlobalStateTable.cs +++ b/Ryujinx.HLE/OsHle/GlobalStateTable.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class GlobalStateTable { diff --git a/Ryujinx.Core/OsHle/Handles/HSharedMem.cs b/Ryujinx.HLE/OsHle/Handles/HSharedMem.cs similarity index 96% rename from Ryujinx.Core/OsHle/Handles/HSharedMem.cs rename to Ryujinx.HLE/OsHle/Handles/HSharedMem.cs index b6bdc8987..6426e585e 100644 --- a/Ryujinx.Core/OsHle/Handles/HSharedMem.cs +++ b/Ryujinx.HLE/OsHle/Handles/HSharedMem.cs @@ -2,7 +2,7 @@ using ChocolArm64.Memory; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class HSharedMem { diff --git a/Ryujinx.Core/OsHle/Handles/HTransferMem.cs b/Ryujinx.HLE/OsHle/Handles/HTransferMem.cs similarity index 93% rename from Ryujinx.Core/OsHle/Handles/HTransferMem.cs rename to Ryujinx.HLE/OsHle/Handles/HTransferMem.cs index 701fc451c..2969a2bae 100644 --- a/Ryujinx.Core/OsHle/Handles/HTransferMem.cs +++ b/Ryujinx.HLE/OsHle/Handles/HTransferMem.cs @@ -1,6 +1,6 @@ using ChocolArm64.Memory; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class HTransferMem { diff --git a/Ryujinx.Core/OsHle/Handles/KEvent.cs b/Ryujinx.HLE/OsHle/Handles/KEvent.cs similarity index 56% rename from Ryujinx.Core/OsHle/Handles/KEvent.cs rename to Ryujinx.HLE/OsHle/Handles/KEvent.cs index 96ff01f7f..df5108f98 100644 --- a/Ryujinx.Core/OsHle/Handles/KEvent.cs +++ b/Ryujinx.HLE/OsHle/Handles/KEvent.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KEvent : KSynchronizationObject { } } \ No newline at end of file diff --git a/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs b/Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs similarity index 94% rename from Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs rename to Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs index 2c8098834..d22b63c68 100644 --- a/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs +++ b/Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KProcessHandleTable { diff --git a/Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs b/Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs similarity index 99% rename from Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs rename to Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs index 63046a72d..fa414f68d 100644 --- a/Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs +++ b/Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.Logging; +using Ryujinx.HLE.Logging; using System; using System.Collections.Concurrent; using System.Threading; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KProcessScheduler : IDisposable { diff --git a/Ryujinx.Core/OsHle/Handles/KSession.cs b/Ryujinx.HLE/OsHle/Handles/KSession.cs similarity index 89% rename from Ryujinx.Core/OsHle/Handles/KSession.cs rename to Ryujinx.HLE/OsHle/Handles/KSession.cs index de3f9efaa..e85de36c8 100644 --- a/Ryujinx.Core/OsHle/Handles/KSession.cs +++ b/Ryujinx.HLE/OsHle/Handles/KSession.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Services; +using Ryujinx.HLE.OsHle.Services; using System; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KSession : IDisposable { diff --git a/Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs b/Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs similarity index 93% rename from Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs rename to Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs index 3f78b9655..0e7d06f6d 100644 --- a/Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs +++ b/Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KSynchronizationObject : IDisposable { diff --git a/Ryujinx.Core/OsHle/Handles/KThread.cs b/Ryujinx.HLE/OsHle/Handles/KThread.cs similarity index 98% rename from Ryujinx.Core/OsHle/Handles/KThread.cs rename to Ryujinx.HLE/OsHle/Handles/KThread.cs index 487828232..d26a52f04 100644 --- a/Ryujinx.Core/OsHle/Handles/KThread.cs +++ b/Ryujinx.HLE/OsHle/Handles/KThread.cs @@ -1,7 +1,7 @@ using ChocolArm64; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class KThread : KSynchronizationObject { diff --git a/Ryujinx.Core/OsHle/Handles/SchedulerThread.cs b/Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs similarity index 96% rename from Ryujinx.Core/OsHle/Handles/SchedulerThread.cs rename to Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs index 4a8b4c09e..5bdefe74e 100644 --- a/Ryujinx.Core/OsHle/Handles/SchedulerThread.cs +++ b/Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class SchedulerThread : IDisposable { diff --git a/Ryujinx.Core/OsHle/Handles/ThreadQueue.cs b/Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs similarity index 99% rename from Ryujinx.Core/OsHle/Handles/ThreadQueue.cs rename to Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs index 7bb2314e8..3cb82f0d4 100644 --- a/Ryujinx.Core/OsHle/Handles/ThreadQueue.cs +++ b/Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Handles +namespace Ryujinx.HLE.OsHle.Handles { class ThreadQueue { diff --git a/Ryujinx.Core/OsHle/Homebrew.cs b/Ryujinx.HLE/OsHle/Homebrew.cs similarity index 98% rename from Ryujinx.Core/OsHle/Homebrew.cs rename to Ryujinx.HLE/OsHle/Homebrew.cs index 873dda025..4266c8db4 100644 --- a/Ryujinx.Core/OsHle/Homebrew.cs +++ b/Ryujinx.HLE/OsHle/Homebrew.cs @@ -1,6 +1,6 @@ using ChocolArm64.Memory; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { static class Homebrew { diff --git a/Ryujinx.Core/OsHle/Horizon.cs b/Ryujinx.HLE/OsHle/Horizon.cs similarity index 97% rename from Ryujinx.Core/OsHle/Horizon.cs rename to Ryujinx.HLE/OsHle/Horizon.cs index 1d4098c7d..a5bf0616c 100644 --- a/Ryujinx.Core/OsHle/Horizon.cs +++ b/Ryujinx.HLE/OsHle/Horizon.cs @@ -1,11 +1,11 @@ -using Ryujinx.Core.Loaders.Executables; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Loaders.Executables; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; using System; using System.Collections.Concurrent; using System.IO; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { public class Horizon : IDisposable { diff --git a/Ryujinx.Core/OsHle/IdDictionary.cs b/Ryujinx.HLE/OsHle/IdDictionary.cs similarity index 98% rename from Ryujinx.Core/OsHle/IdDictionary.cs rename to Ryujinx.HLE/OsHle/IdDictionary.cs index 2a498e7f6..7a93f6346 100644 --- a/Ryujinx.Core/OsHle/IdDictionary.cs +++ b/Ryujinx.HLE/OsHle/IdDictionary.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class IdDictionary { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs b/Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs similarity index 95% rename from Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs index 01bb15392..12bff0fba 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { struct IpcBuffDesc { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs b/Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs similarity index 98% rename from Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs index 572c0e649..953cac764 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { class IpcHandleDesc { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcHandler.cs b/Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs similarity index 98% rename from Ryujinx.Core/OsHle/Ipc/IpcHandler.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs index 7e9fb1c15..9b46cf4bf 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcHandler.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs @@ -1,9 +1,9 @@ using ChocolArm64.Memory; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.OsHle.Handles; using System; using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { static class IpcHandler { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcMagic.cs b/Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs similarity index 85% rename from Ryujinx.Core/OsHle/Ipc/IpcMagic.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs index e3b8c74eb..c3f9655fb 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcMagic.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { abstract class IpcMagic { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcMessage.cs b/Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs similarity index 99% rename from Ryujinx.Core/OsHle/Ipc/IpcMessage.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs index c03874fb1..4e648aec9 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcMessage.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { class IpcMessage { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs b/Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs similarity index 81% rename from Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs index 560af41e7..f596fea46 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { enum IpcMessageType { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs b/Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs similarity index 95% rename from Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs index 4eb15b9d7..f5a9f651e 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { struct IpcPtrBuffDesc { diff --git a/Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs b/Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs similarity index 91% rename from Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs rename to Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs index 78ba142e5..59191c165 100644 --- a/Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs +++ b/Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { struct IpcRecvListBuffDesc { diff --git a/Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs b/Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs similarity index 65% rename from Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs rename to Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs index ea7580744..47f72cb70 100644 --- a/Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs +++ b/Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Ipc +namespace Ryujinx.HLE.OsHle.Ipc { delegate long ServiceProcessRequest(ServiceCtx Context); } \ No newline at end of file diff --git a/Ryujinx.Core/OsHle/Kernel/KernelErr.cs b/Ryujinx.HLE/OsHle/Kernel/KernelErr.cs similarity index 94% rename from Ryujinx.Core/OsHle/Kernel/KernelErr.cs rename to Ryujinx.HLE/OsHle/Kernel/KernelErr.cs index 17c0044cd..643e5f687 100644 --- a/Ryujinx.Core/OsHle/Kernel/KernelErr.cs +++ b/Ryujinx.HLE/OsHle/Kernel/KernelErr.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { static class KernelErr { diff --git a/Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs b/Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs similarity index 90% rename from Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs rename to Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs index 84fb0b85e..966fdacae 100644 --- a/Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs +++ b/Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { static class NsTimeConverter { diff --git a/Ryujinx.Core/OsHle/Kernel/SvcHandler.cs b/Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs similarity index 97% rename from Ryujinx.Core/OsHle/Kernel/SvcHandler.cs rename to Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs index 3a9166e4e..f3a5fae03 100644 --- a/Ryujinx.Core/OsHle/Kernel/SvcHandler.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs @@ -1,14 +1,14 @@ using ChocolArm64.Events; using ChocolArm64.Memory; using ChocolArm64.State; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Threading; -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { partial class SvcHandler : IDisposable { @@ -47,6 +47,7 @@ namespace Ryujinx.Core.OsHle.Kernel { 0x0b, SvcSleepThread }, { 0x0c, SvcGetThreadPriority }, { 0x0d, SvcSetThreadPriority }, + { 0x0e, SvcGetThreadCoreMask }, { 0x0f, SvcSetThreadCoreMask }, { 0x10, SvcGetCurrentProcessorNumber }, { 0x12, SvcClearEvent }, diff --git a/Ryujinx.Core/OsHle/Kernel/SvcMemory.cs b/Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs similarity index 98% rename from Ryujinx.Core/OsHle/Kernel/SvcMemory.cs rename to Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs index 3e3cfab58..bb73f1ea1 100644 --- a/Ryujinx.Core/OsHle/Kernel/SvcMemory.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs @@ -1,11 +1,11 @@ using ChocolArm64.Memory; using ChocolArm64.State; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { partial class SvcHandler { diff --git a/Ryujinx.Core/OsHle/Kernel/SvcSystem.cs b/Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs similarity index 97% rename from Ryujinx.Core/OsHle/Kernel/SvcSystem.cs rename to Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs index 638625d82..a32b2d86f 100644 --- a/Ryujinx.Core/OsHle/Kernel/SvcSystem.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs @@ -1,16 +1,16 @@ using ChocolArm64.Memory; using ChocolArm64.State; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Exceptions; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.Services; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Exceptions; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Services; using System; using System.Threading; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { partial class SvcHandler { @@ -352,7 +352,7 @@ namespace Ryujinx.Core.OsHle.Kernel case 15: ThreadState.X1 = MemoryRegions.MapRegionSize; break; - + case 16: ThreadState.X1 = IsVirtualMemoryEnabled ? 1 : 0; break; diff --git a/Ryujinx.Core/OsHle/Kernel/SvcThread.cs b/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs similarity index 90% rename from Ryujinx.Core/OsHle/Kernel/SvcThread.cs rename to Ryujinx.HLE/OsHle/Kernel/SvcThread.cs index 118417581..9dcfaaeed 100644 --- a/Ryujinx.Core/OsHle/Kernel/SvcThread.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcThread.cs @@ -1,11 +1,11 @@ using ChocolArm64.State; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; using System.Threading; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { partial class SvcHandler { @@ -139,6 +139,28 @@ namespace Ryujinx.Core.OsHle.Kernel } } + private void SvcGetThreadCoreMask(AThreadState ThreadState) + { + int Handle = (int)ThreadState.X2; + + Ns.Log.PrintDebug(LogClass.KernelSvc, "Handle = " + Handle.ToString("x8")); + + KThread Thread = GetThread(ThreadState.Tpidr, Handle); + + if (Thread != null) + { + ThreadState.X0 = 0; + ThreadState.X1 = (ulong)Thread.IdealCore; + ThreadState.X2 = (ulong)Thread.CoreMask; + } + else + { + Ns.Log.PrintWarning(LogClass.KernelSvc, $"Invalid thread handle 0x{Handle:x8}!"); + + ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle); + } + } + private void SvcSetThreadCoreMask(AThreadState ThreadState) { //FIXME: This is wrong, but the "correct" way to handle diff --git a/Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs b/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs similarity index 99% rename from Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs rename to Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs index 12bc657a6..030e6e3d6 100644 --- a/Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs +++ b/Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs @@ -1,14 +1,14 @@ using ChocolArm64.State; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Kernel +namespace Ryujinx.HLE.OsHle.Kernel { partial class SvcHandler { diff --git a/Ryujinx.Core/OsHle/MemoryAllocator.cs b/Ryujinx.HLE/OsHle/MemoryAllocator.cs similarity index 86% rename from Ryujinx.Core/OsHle/MemoryAllocator.cs rename to Ryujinx.HLE/OsHle/MemoryAllocator.cs index e57f52640..8696aa4d1 100644 --- a/Ryujinx.Core/OsHle/MemoryAllocator.cs +++ b/Ryujinx.HLE/OsHle/MemoryAllocator.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class MemoryAllocator { diff --git a/Ryujinx.Core/OsHle/MemoryRegions.cs b/Ryujinx.HLE/OsHle/MemoryRegions.cs similarity index 96% rename from Ryujinx.Core/OsHle/MemoryRegions.cs rename to Ryujinx.HLE/OsHle/MemoryRegions.cs index f7ef47f46..198c621cc 100644 --- a/Ryujinx.Core/OsHle/MemoryRegions.cs +++ b/Ryujinx.HLE/OsHle/MemoryRegions.cs @@ -1,6 +1,6 @@ using ChocolArm64.Memory; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { static class MemoryRegions { diff --git a/Ryujinx.Core/OsHle/MemoryType.cs b/Ryujinx.HLE/OsHle/MemoryType.cs similarity index 96% rename from Ryujinx.Core/OsHle/MemoryType.cs rename to Ryujinx.HLE/OsHle/MemoryType.cs index d3b43dd55..64b079472 100644 --- a/Ryujinx.Core/OsHle/MemoryType.cs +++ b/Ryujinx.HLE/OsHle/MemoryType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { enum MemoryType { diff --git a/Ryujinx.Core/OsHle/Process.cs b/Ryujinx.HLE/OsHle/Process.cs similarity index 97% rename from Ryujinx.Core/OsHle/Process.cs rename to Ryujinx.HLE/OsHle/Process.cs index ea8ae1397..f01a09278 100644 --- a/Ryujinx.Core/OsHle/Process.cs +++ b/Ryujinx.HLE/OsHle/Process.cs @@ -2,20 +2,20 @@ using ChocolArm64; using ChocolArm64.Events; using ChocolArm64.Memory; using ChocolArm64.State; -using Ryujinx.Core.Loaders; -using Ryujinx.Core.Loaders.Executables; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Diagnostics; -using Ryujinx.Core.OsHle.Exceptions; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Kernel; -using Ryujinx.Core.OsHle.Services.Nv; +using Ryujinx.HLE.Loaders; +using Ryujinx.HLE.Loaders.Executables; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Diagnostics; +using Ryujinx.HLE.OsHle.Exceptions; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Kernel; +using Ryujinx.HLE.OsHle.Services.Nv; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Text; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class Process : IDisposable { diff --git a/Ryujinx.Core/OsHle/ServiceCtx.cs b/Ryujinx.HLE/OsHle/ServiceCtx.cs similarity index 93% rename from Ryujinx.Core/OsHle/ServiceCtx.cs rename to Ryujinx.HLE/OsHle/ServiceCtx.cs index 7716507fe..eb9ff5fd8 100644 --- a/Ryujinx.Core/OsHle/ServiceCtx.cs +++ b/Ryujinx.HLE/OsHle/ServiceCtx.cs @@ -1,9 +1,9 @@ using ChocolArm64.Memory; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.IO; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { class ServiceCtx { diff --git a/Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs b/Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs similarity index 76% rename from Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs rename to Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs index 84fb62bdf..470b9ccb8 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs +++ b/Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Acc +namespace Ryujinx.HLE.OsHle.Services.Acc { class IAccountServiceForApplication : IpcService { @@ -15,6 +15,8 @@ namespace Ryujinx.Core.OsHle.Services.Acc m_Commands = new Dictionary() { { 0, GetUserCount }, + { 1, GetUserExistence }, + { 2, ListAllUsers }, { 3, ListOpenUsers }, { 4, GetLastOpenedUser }, { 5, GetProfile }, @@ -32,6 +34,22 @@ namespace Ryujinx.Core.OsHle.Services.Acc return 0; } + public long GetUserExistence(ServiceCtx Context) + { + Context.ResponseData.Write(1); + + Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed."); + + return 0; + } + + public long ListAllUsers(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed."); + + return 0; + } + public long ListOpenUsers(ServiceCtx Context) { Context.Ns.Log.PrintStub(LogClass.ServiceAcc, "Stubbed."); diff --git a/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs b/Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs rename to Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs index 4dbbd8d16..ce3865f48 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs +++ b/Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Acc +namespace Ryujinx.HLE.OsHle.Services.Acc { class IManagerForApplication : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs b/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Acc/IProfile.cs rename to Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs index 98df30736..24daa3d57 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs +++ b/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Acc +namespace Ryujinx.HLE.OsHle.Services.Acc { class IProfile : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/AmErr.cs b/Ryujinx.HLE/OsHle/Services/Am/AmErr.cs similarity index 65% rename from Ryujinx.Core/OsHle/Services/Am/AmErr.cs rename to Ryujinx.HLE/OsHle/Services/Am/AmErr.cs index cb41c2d0f..662246392 100644 --- a/Ryujinx.Core/OsHle/Services/Am/AmErr.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/AmErr.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { static class AmErr { diff --git a/Ryujinx.Core/OsHle/Services/Am/FocusState.cs b/Ryujinx.HLE/OsHle/Services/Am/FocusState.cs similarity index 66% rename from Ryujinx.Core/OsHle/Services/Am/FocusState.cs rename to Ryujinx.HLE/OsHle/Services/Am/FocusState.cs index 2585cf2cc..074f159eb 100644 --- a/Ryujinx.Core/OsHle/Services/Am/FocusState.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/FocusState.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { enum FocusState { diff --git a/Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs b/Ryujinx.HLE/OsHle/Services/Am/IAllSystemAppletProxiesService.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs rename to Ryujinx.HLE/OsHle/Services/Am/IAllSystemAppletProxiesService.cs index 0d20f94cb..8dc17cecf 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IAllSystemAppletProxiesService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IAllSystemAppletProxiesService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationCreator.cs b/Ryujinx.HLE/OsHle/Services/Am/IApplicationCreator.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Am/IApplicationCreator.cs rename to Ryujinx.HLE/OsHle/Services/Am/IApplicationCreator.cs index 1114897b3..6ee5b5c2e 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationCreator.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IApplicationCreator.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IApplicationCreator : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs b/Ryujinx.HLE/OsHle/Services/Am/IApplicationFunctions.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs rename to Ryujinx.HLE/OsHle/Services/Am/IApplicationFunctions.cs index 308a43220..e25b524ab 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IApplicationFunctions.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IApplicationFunctions : IpcService { @@ -91,7 +91,7 @@ namespace Ryujinx.Core.OsHle.Services.Am public long GetPseudoDeviceId(ServiceCtx Context) { Context.Ns.Log.PrintStub(LogClass.ServiceAm, "Stubbed."); - + Context.ResponseData.Write(0L); Context.ResponseData.Write(0L); diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs b/Ryujinx.HLE/OsHle/Services/Am/IApplicationProxy.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs rename to Ryujinx.HLE/OsHle/Services/Am/IApplicationProxy.cs index f150f4271..ec0285025 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IApplicationProxy.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IApplicationProxy : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxyService.cs b/Ryujinx.HLE/OsHle/Services/Am/IApplicationProxyService.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Am/IApplicationProxyService.cs rename to Ryujinx.HLE/OsHle/Services/Am/IApplicationProxyService.cs index 6e33a1de8..6b39b265d 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxyService.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IApplicationProxyService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IApplicationProxyService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs b/Ryujinx.HLE/OsHle/Services/Am/IAudioController.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/Am/IAudioController.cs rename to Ryujinx.HLE/OsHle/Services/Am/IAudioController.cs index 7145434fc..3cb631816 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IAudioController.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IAudioController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs b/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs similarity index 92% rename from Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs rename to Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs index ba87cf32d..2b575cb7c 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/ICommonStateGetter.cs @@ -1,11 +1,11 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class ICommonStateGetter : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs b/Ryujinx.HLE/OsHle/Services/Am/IDebugFunctions.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs rename to Ryujinx.HLE/OsHle/Services/Am/IDebugFunctions.cs index b7c7e9cf6..b07c68dd8 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IDebugFunctions.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IDebugFunctions : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs b/Ryujinx.HLE/OsHle/Services/Am/IDisplayController.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs rename to Ryujinx.HLE/OsHle/Services/Am/IDisplayController.cs index a56d17130..8785f0719 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IDisplayController.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IDisplayController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IGlobalStateController.cs b/Ryujinx.HLE/OsHle/Services/Am/IGlobalStateController.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Am/IGlobalStateController.cs rename to Ryujinx.HLE/OsHle/Services/Am/IGlobalStateController.cs index d5810154e..0fbcb2840 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IGlobalStateController.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IGlobalStateController.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IGlobalStateController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IHomeMenuFunctions.cs b/Ryujinx.HLE/OsHle/Services/Am/IHomeMenuFunctions.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Am/IHomeMenuFunctions.cs rename to Ryujinx.HLE/OsHle/Services/Am/IHomeMenuFunctions.cs index b516c0e36..1005fe0c5 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IHomeMenuFunctions.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IHomeMenuFunctions.cs @@ -1,46 +1,46 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; -using System.Collections.Generic; - -namespace Ryujinx.Core.OsHle.Services.Am -{ - class IHomeMenuFunctions : IpcService - { - private Dictionary m_Commands; - - public override IReadOnlyDictionary Commands => m_Commands; - - private KEvent ChannelEvent; - - public IHomeMenuFunctions() - { - m_Commands = new Dictionary() - { - { 10, RequestToGetForeground }, - { 21, GetPopFromGeneralChannelEvent } - }; - - //ToDo: Signal this Event somewhere in future. - ChannelEvent = new KEvent(); - } - - public long RequestToGetForeground(ServiceCtx Context) - { - Context.Ns.Log.PrintStub(LogClass.ServiceAm, "Stubbed."); - - return 0; - } - - public long GetPopFromGeneralChannelEvent(ServiceCtx Context) - { - int Handle = Context.Process.HandleTable.OpenHandle(ChannelEvent); - - Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); - - Context.Ns.Log.PrintStub(LogClass.ServiceAm, "Stubbed."); - - return 0; - } - } -} +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; +using System.Collections.Generic; + +namespace Ryujinx.HLE.OsHle.Services.Am +{ + class IHomeMenuFunctions : IpcService + { + private Dictionary m_Commands; + + public override IReadOnlyDictionary Commands => m_Commands; + + private KEvent ChannelEvent; + + public IHomeMenuFunctions() + { + m_Commands = new Dictionary() + { + { 10, RequestToGetForeground }, + { 21, GetPopFromGeneralChannelEvent } + }; + + //ToDo: Signal this Event somewhere in future. + ChannelEvent = new KEvent(); + } + + public long RequestToGetForeground(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceAm, "Stubbed."); + + return 0; + } + + public long GetPopFromGeneralChannelEvent(ServiceCtx Context) + { + int Handle = Context.Process.HandleTable.OpenHandle(ChannelEvent); + + Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); + + Context.Ns.Log.PrintStub(LogClass.ServiceAm, "Stubbed."); + + return 0; + } + } +} diff --git a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletAccessor.cs b/Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletAccessor.cs similarity index 93% rename from Ryujinx.Core/OsHle/Services/Am/ILibraryAppletAccessor.cs rename to Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletAccessor.cs index c990d647d..b1955cc6d 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletAccessor.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletAccessor.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class ILibraryAppletAccessor : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs b/Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletCreator.cs similarity index 92% rename from Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs rename to Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletCreator.cs index 9d0d5957d..66973fc6c 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/ILibraryAppletCreator.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class ILibraryAppletCreator : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs b/Ryujinx.HLE/OsHle/Services/Am/ISelfController.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Am/ISelfController.cs rename to Ryujinx.HLE/OsHle/Services/Am/ISelfController.cs index 3fd5c7fc4..ee0fb9156 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/ISelfController.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class ISelfController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IStorage.cs b/Ryujinx.HLE/OsHle/Services/Am/IStorage.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Am/IStorage.cs rename to Ryujinx.HLE/OsHle/Services/Am/IStorage.cs index fef4a237e..0aa1f571b 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IStorage.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IStorage.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IStorage : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs b/Ryujinx.HLE/OsHle/Services/Am/IStorageAccessor.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs rename to Ryujinx.HLE/OsHle/Services/Am/IStorageAccessor.cs index 4a75c0aab..c2a8c11e2 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IStorageAccessor.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IStorageAccessor : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ISystemAppletProxy.cs b/Ryujinx.HLE/OsHle/Services/Am/ISystemAppletProxy.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/Am/ISystemAppletProxy.cs rename to Ryujinx.HLE/OsHle/Services/Am/ISystemAppletProxy.cs index 5a440659d..e0d78e34a 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ISystemAppletProxy.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/ISystemAppletProxy.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class ISystemAppletProxy : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs b/Ryujinx.HLE/OsHle/Services/Am/IWindowController.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Am/IWindowController.cs rename to Ryujinx.HLE/OsHle/Services/Am/IWindowController.cs index 554ac00a2..d9ab5db3c 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/IWindowController.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class IWindowController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs b/Ryujinx.HLE/OsHle/Services/Am/MessageInfo.cs similarity index 78% rename from Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs rename to Ryujinx.HLE/OsHle/Services/Am/MessageInfo.cs index 45bf4326f..bae985fba 100644 --- a/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/MessageInfo.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { enum MessageInfo { diff --git a/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs b/Ryujinx.HLE/OsHle/Services/Am/OperationMode.cs similarity index 66% rename from Ryujinx.Core/OsHle/Services/Am/OperationMode.cs rename to Ryujinx.HLE/OsHle/Services/Am/OperationMode.cs index f82a825b4..632ce9316 100644 --- a/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/OperationMode.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { enum OperationMode { diff --git a/Ryujinx.Core/OsHle/Services/Am/StorageHelper.cs b/Ryujinx.HLE/OsHle/Services/Am/StorageHelper.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/Am/StorageHelper.cs rename to Ryujinx.HLE/OsHle/Services/Am/StorageHelper.cs index fa4f6bedb..56e2a6529 100644 --- a/Ryujinx.Core/OsHle/Services/Am/StorageHelper.cs +++ b/Ryujinx.HLE/OsHle/Services/Am/StorageHelper.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.Services.Am +namespace Ryujinx.HLE.OsHle.Services.Am { class StorageHelper { diff --git a/Ryujinx.Core/OsHle/Services/Apm/IManager.cs b/Ryujinx.HLE/OsHle/Services/Apm/IManager.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Apm/IManager.cs rename to Ryujinx.HLE/OsHle/Services/Apm/IManager.cs index 7320328e5..22150d6e0 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/IManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Apm/IManager.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Apm +namespace Ryujinx.HLE.OsHle.Services.Apm { class IManager : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Apm/ISession.cs b/Ryujinx.HLE/OsHle/Services/Apm/ISession.cs similarity index 92% rename from Ryujinx.Core/OsHle/Services/Apm/ISession.cs rename to Ryujinx.HLE/OsHle/Services/Apm/ISession.cs index 3b3e98c98..3c9bf07c4 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/ISession.cs +++ b/Ryujinx.HLE/OsHle/Services/Apm/ISession.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Apm +namespace Ryujinx.HLE.OsHle.Services.Apm { class ISession : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Apm/PerformanceConfiguration.cs b/Ryujinx.HLE/OsHle/Services/Apm/PerformanceConfiguration.cs similarity index 93% rename from Ryujinx.Core/OsHle/Services/Apm/PerformanceConfiguration.cs rename to Ryujinx.HLE/OsHle/Services/Apm/PerformanceConfiguration.cs index 5a4d072e2..07d59285b 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/PerformanceConfiguration.cs +++ b/Ryujinx.HLE/OsHle/Services/Apm/PerformanceConfiguration.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Apm +namespace Ryujinx.HLE.OsHle.Services.Apm { enum PerformanceConfiguration : uint { diff --git a/Ryujinx.Core/OsHle/Services/Apm/PerformanceMode.cs b/Ryujinx.HLE/OsHle/Services/Apm/PerformanceMode.cs similarity index 65% rename from Ryujinx.Core/OsHle/Services/Apm/PerformanceMode.cs rename to Ryujinx.HLE/OsHle/Services/Apm/PerformanceMode.cs index db6ef4072..d89e27607 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/PerformanceMode.cs +++ b/Ryujinx.HLE/OsHle/Services/Apm/PerformanceMode.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Apm +namespace Ryujinx.HLE.OsHle.Services.Apm { enum PerformanceMode { diff --git a/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs rename to Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs index 9ba935414..9d68c24ab 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { [StructLayout(LayoutKind.Sequential)] struct AudioOutData diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioDevice.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs rename to Ryujinx.HLE/OsHle/Services/Aud/IAudioDevice.cs index fccc0647a..67c0d837e 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioDevice.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; using System.Text; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { class IAudioDevice : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs rename to Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs index fba97a3f5..ef8bd89ba 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs @@ -1,12 +1,12 @@ using ChocolArm64.Memory; using Ryujinx.Audio; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { class IAudioOut : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs rename to Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs index 82e547ae5..a6b30835a 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioOutManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs @@ -1,12 +1,12 @@ using ChocolArm64.Memory; using Ryujinx.Audio; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; using System.Text; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { class IAudioOutManager : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs rename to Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs index 4d06649fe..9c495db5a 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { class IAudioRenderer : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs rename to Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs index c1166418e..6c0ba8705 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioRendererManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Aud +namespace Ryujinx.HLE.OsHle.Services.Aud { class IAudioRendererManager : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Bsd/BsdError.cs b/Ryujinx.HLE/OsHle/Services/Bsd/BsdError.cs similarity index 73% rename from Ryujinx.Core/OsHle/Services/Bsd/BsdError.cs rename to Ryujinx.HLE/OsHle/Services/Bsd/BsdError.cs index a1ac0433b..114130dcf 100644 --- a/Ryujinx.Core/OsHle/Services/Bsd/BsdError.cs +++ b/Ryujinx.HLE/OsHle/Services/Bsd/BsdError.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Bsd +namespace Ryujinx.HLE.OsHle.Services.Bsd { //bsd_errno == (SocketException.ErrorCode - 10000) public enum BsdError diff --git a/Ryujinx.Core/OsHle/Services/Bsd/BsdSocket.cs b/Ryujinx.HLE/OsHle/Services/Bsd/BsdSocket.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Bsd/BsdSocket.cs rename to Ryujinx.HLE/OsHle/Services/Bsd/BsdSocket.cs index 592b07d95..9cde99478 100644 --- a/Ryujinx.Core/OsHle/Services/Bsd/BsdSocket.cs +++ b/Ryujinx.HLE/OsHle/Services/Bsd/BsdSocket.cs @@ -1,7 +1,7 @@ using System.Net; using System.Net.Sockets; -namespace Ryujinx.Core.OsHle.Services.Bsd +namespace Ryujinx.HLE.OsHle.Services.Bsd { class BsdSocket { diff --git a/Ryujinx.Core/OsHle/Services/Bsd/IClient.cs b/Ryujinx.HLE/OsHle/Services/Bsd/IClient.cs similarity index 99% rename from Ryujinx.Core/OsHle/Services/Bsd/IClient.cs rename to Ryujinx.HLE/OsHle/Services/Bsd/IClient.cs index fe46d6810..15ce92a16 100644 --- a/Ryujinx.Core/OsHle/Services/Bsd/IClient.cs +++ b/Ryujinx.HLE/OsHle/Services/Bsd/IClient.cs @@ -1,12 +1,12 @@ -using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.Utilities; +using Ryujinx.HLE.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Utilities; using System.Collections.Generic; using System.IO; using System.Net; using System.Net.Sockets; using System.Threading.Tasks; -namespace Ryujinx.Core.OsHle.Services.Bsd +namespace Ryujinx.HLE.OsHle.Services.Bsd { class IClient : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Caps/IAlbumAccessorService.cs b/Ryujinx.HLE/OsHle/Services/Caps/IAlbumAccessorService.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Caps/IAlbumAccessorService.cs rename to Ryujinx.HLE/OsHle/Services/Caps/IAlbumAccessorService.cs index d92f3e53c..04a81f903 100644 --- a/Ryujinx.Core/OsHle/Services/Caps/IAlbumAccessorService.cs +++ b/Ryujinx.HLE/OsHle/Services/Caps/IAlbumAccessorService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Caps +namespace Ryujinx.HLE.OsHle.Services.Caps { class IAlbumAccessorService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Caps/IScreenshotService.cs b/Ryujinx.HLE/OsHle/Services/Caps/IScreenshotService.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Caps/IScreenshotService.cs rename to Ryujinx.HLE/OsHle/Services/Caps/IScreenshotService.cs index af9b53a8b..9b1005edc 100644 --- a/Ryujinx.Core/OsHle/Services/Caps/IScreenshotService.cs +++ b/Ryujinx.HLE/OsHle/Services/Caps/IScreenshotService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Caps +namespace Ryujinx.HLE.OsHle.Services.Caps { class IScreenshotService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs b/Ryujinx.HLE/OsHle/Services/Friend/IFriendService.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs rename to Ryujinx.HLE/OsHle/Services/Friend/IFriendService.cs index c6e29f860..d5843ffbd 100644 --- a/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs +++ b/Ryujinx.HLE/OsHle/Services/Friend/IFriendService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Friend +namespace Ryujinx.HLE.OsHle.Services.Friend { class IFriendService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Friend/IServiceCreator.cs b/Ryujinx.HLE/OsHle/Services/Friend/IServiceCreator.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Friend/IServiceCreator.cs rename to Ryujinx.HLE/OsHle/Services/Friend/IServiceCreator.cs index 2c66d9658..6b9a265f6 100644 --- a/Ryujinx.Core/OsHle/Services/Friend/IServiceCreator.cs +++ b/Ryujinx.HLE/OsHle/Services/Friend/IServiceCreator.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Friend +namespace Ryujinx.HLE.OsHle.Services.Friend { class IServiceCreator : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/FsErr.cs similarity index 80% rename from Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/FsErr.cs index 762f65511..bdc70959f 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/FsErr.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { static class FsErr { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/IDirectory.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/IDirectory.cs index a5f18b432..bb4b7a030 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/IDirectory.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; using System.IO; using System.Text; -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { class IDirectory : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/IFile.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/IFile.cs index bfd4b3769..a610a3ab8 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/IFile.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { class IFile : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystem.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystem.cs index 23228db96..441b7e8ad 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystem.cs @@ -1,12 +1,12 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; using System.IO; using System.Text; -using static Ryujinx.Core.OsHle.ErrorCode; +using static Ryujinx.HLE.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { class IFileSystem : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystemProxy.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/FspSrv/IFileSystemProxy.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystemProxy.cs index 4fbf018a4..84a0bc3de 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystemProxy.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/IFileSystemProxy.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { class IFileSystemProxy : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs b/Ryujinx.HLE/OsHle/Services/FspSrv/IStorage.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs rename to Ryujinx.HLE/OsHle/Services/FspSrv/IStorage.cs index 7fd423e8b..56c27d03d 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs +++ b/Ryujinx.HLE/OsHle/Services/FspSrv/IStorage.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.Services.FspSrv +namespace Ryujinx.HLE.OsHle.Services.FspSrv { class IStorage : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs b/Ryujinx.HLE/OsHle/Services/Hid/IActiveVibrationDeviceList.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs rename to Ryujinx.HLE/OsHle/Services/Hid/IActiveVibrationDeviceList.cs index d02fa17e7..12eaf7063 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs +++ b/Ryujinx.HLE/OsHle/Services/Hid/IActiveVibrationDeviceList.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Hid +namespace Ryujinx.HLE.OsHle.Services.Hid { class IActiveApplicationDeviceList : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs b/Ryujinx.HLE/OsHle/Services/Hid/IAppletResource.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs rename to Ryujinx.HLE/OsHle/Services/Hid/IAppletResource.cs index 23dfd7a22..2ef67cc3a 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs +++ b/Ryujinx.HLE/OsHle/Services/Hid/IAppletResource.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Hid +namespace Ryujinx.HLE.OsHle.Services.Hid { class IAppletResource : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/IHidServer.cs b/Ryujinx.HLE/OsHle/Services/Hid/IHidServer.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Hid/IHidServer.cs rename to Ryujinx.HLE/OsHle/Services/Hid/IHidServer.cs index b603d9360..79d37fd4c 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/IHidServer.cs +++ b/Ryujinx.HLE/OsHle/Services/Hid/IHidServer.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.Input; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Input; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Hid +namespace Ryujinx.HLE.OsHle.Services.Hid { class IHidServer : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/IIpcService.cs b/Ryujinx.HLE/OsHle/Services/IIpcService.cs similarity index 63% rename from Ryujinx.Core/OsHle/Services/IIpcService.cs rename to Ryujinx.HLE/OsHle/Services/IIpcService.cs index 98b5c2390..606753804 100644 --- a/Ryujinx.Core/OsHle/Services/IIpcService.cs +++ b/Ryujinx.HLE/OsHle/Services/IIpcService.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services +namespace Ryujinx.HLE.OsHle.Services { interface IIpcService { - IReadOnlyDictionary Commands { get; } + IReadOnlyDictionary Commands { get; } } } \ No newline at end of file diff --git a/Ryujinx.Core/OsHle/Services/IpcService.cs b/Ryujinx.HLE/OsHle/Services/IpcService.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/IpcService.cs rename to Ryujinx.HLE/OsHle/Services/IpcService.cs index d2eadd270..25fd56fec 100644 --- a/Ryujinx.Core/OsHle/Services/IpcService.cs +++ b/Ryujinx.HLE/OsHle/Services/IpcService.cs @@ -1,11 +1,11 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.Services +namespace Ryujinx.HLE.OsHle.Services { abstract class IpcService : IIpcService { diff --git a/Ryujinx.Core/OsHle/Services/Lm/ILogService.cs b/Ryujinx.HLE/OsHle/Services/Lm/ILogService.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Lm/ILogService.cs rename to Ryujinx.HLE/OsHle/Services/Lm/ILogService.cs index 3315cf4cd..c3aeb1844 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/ILogService.cs +++ b/Ryujinx.HLE/OsHle/Services/Lm/ILogService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Lm +namespace Ryujinx.HLE.OsHle.Services.Lm { class ILogService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs b/Ryujinx.HLE/OsHle/Services/Lm/ILogger.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Lm/ILogger.cs rename to Ryujinx.HLE/OsHle/Services/Lm/ILogger.cs index 41f3710ba..90edf2ad3 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs +++ b/Ryujinx.HLE/OsHle/Services/Lm/ILogger.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; using System.IO; using System.Text; -namespace Ryujinx.Core.OsHle.Services.Lm +namespace Ryujinx.HLE.OsHle.Services.Lm { class ILogger : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Lm/LmLogField.cs b/Ryujinx.HLE/OsHle/Services/Lm/LmLogField.cs similarity index 82% rename from Ryujinx.Core/OsHle/Services/Lm/LmLogField.cs rename to Ryujinx.HLE/OsHle/Services/Lm/LmLogField.cs index 2906c7c3f..33593103b 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/LmLogField.cs +++ b/Ryujinx.HLE/OsHle/Services/Lm/LmLogField.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Lm +namespace Ryujinx.HLE.OsHle.Services.Lm { enum LmLogField { diff --git a/Ryujinx.Core/OsHle/Services/Lm/LmLogLevel.cs b/Ryujinx.HLE/OsHle/Services/Lm/LmLogLevel.cs similarity index 73% rename from Ryujinx.Core/OsHle/Services/Lm/LmLogLevel.cs rename to Ryujinx.HLE/OsHle/Services/Lm/LmLogLevel.cs index f5c662338..d051a595a 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/LmLogLevel.cs +++ b/Ryujinx.HLE/OsHle/Services/Lm/LmLogLevel.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Lm +namespace Ryujinx.HLE.OsHle.Services.Lm { enum LmLogLevel { diff --git a/Ryujinx.Core/OsHle/Services/Mm/IRequest.cs b/Ryujinx.HLE/OsHle/Services/Mm/IRequest.cs similarity index 91% rename from Ryujinx.Core/OsHle/Services/Mm/IRequest.cs rename to Ryujinx.HLE/OsHle/Services/Mm/IRequest.cs index e63793157..c60b7f523 100644 --- a/Ryujinx.Core/OsHle/Services/Mm/IRequest.cs +++ b/Ryujinx.HLE/OsHle/Services/Mm/IRequest.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Mm +namespace Ryujinx.HLE.OsHle.Services.Mm { class IRequest : IpcService { diff --git a/Ryujinx.HLE/OsHle/Services/Nfp/DeviceState.cs b/Ryujinx.HLE/OsHle/Services/Nfp/DeviceState.cs new file mode 100644 index 000000000..1863e0d92 --- /dev/null +++ b/Ryujinx.HLE/OsHle/Services/Nfp/DeviceState.cs @@ -0,0 +1,7 @@ +namespace Ryujinx.HLE.OsHle.Services.Nfp +{ + enum DeviceState + { + Initialized = 0 + } +} \ No newline at end of file diff --git a/Ryujinx.HLE/OsHle/Services/Nfp/IUser.cs b/Ryujinx.HLE/OsHle/Services/Nfp/IUser.cs new file mode 100644 index 000000000..4b423ba71 --- /dev/null +++ b/Ryujinx.HLE/OsHle/Services/Nfp/IUser.cs @@ -0,0 +1,114 @@ +using Ryujinx.HLE.Input; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; +using System.Collections.Generic; + +namespace Ryujinx.HLE.OsHle.Services.Nfp +{ + class IUser : IpcService + { + private Dictionary m_Commands; + + public override IReadOnlyDictionary Commands => m_Commands; + + private const HidControllerId NpadId = HidControllerId.CONTROLLER_PLAYER_1; + + private State State = State.NonInitialized; + + private DeviceState DeviceState = DeviceState.Initialized; + + private KEvent ActivateEvent; + + private KEvent DeactivateEvent; + + private KEvent AvailabilityChangeEvent; + + public IUser() + { + m_Commands = new Dictionary() + { + { 0, Initialize }, + { 17, AttachActivateEvent }, + { 18, AttachDeactivateEvent }, + { 19, GetState }, + { 20, GetDeviceState }, + { 21, GetNpadId }, + { 23, AttachAvailabilityChangeEvent } + }; + + ActivateEvent = new KEvent(); + DeactivateEvent = new KEvent(); + AvailabilityChangeEvent = new KEvent(); + } + + public long Initialize(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + State = State.Initialized; + + return 0; + } + + public long AttachActivateEvent(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + int Handle = Context.Process.HandleTable.OpenHandle(ActivateEvent); + + Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle);; + + return 0; + } + + public long AttachDeactivateEvent(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + int Handle = Context.Process.HandleTable.OpenHandle(DeactivateEvent); + + Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); + + return 0; + } + + public long GetState(ServiceCtx Context) + { + Context.ResponseData.Write((int)State); + + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + return 0; + } + + public long GetDeviceState(ServiceCtx Context) + { + Context.ResponseData.Write((int)DeviceState); + + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + return 0; + } + + public long GetNpadId(ServiceCtx Context) + { + Context.ResponseData.Write((int)NpadId); + + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + return 0; + } + + public long AttachAvailabilityChangeEvent(ServiceCtx Context) + { + Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); + + int Handle = Context.Process.HandleTable.OpenHandle(AvailabilityChangeEvent); + + Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); + + return 0; + } + } +} \ No newline at end of file diff --git a/Ryujinx.Core/OsHle/Services/Nfp/IUserManager.cs b/Ryujinx.HLE/OsHle/Services/Nfp/IUserManager.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Nfp/IUserManager.cs rename to Ryujinx.HLE/OsHle/Services/Nfp/IUserManager.cs index 662987d74..845ce7cf0 100644 --- a/Ryujinx.Core/OsHle/Services/Nfp/IUserManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Nfp/IUserManager.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Nfp +namespace Ryujinx.HLE.OsHle.Services.Nfp { class IUserManager : IpcService { diff --git a/Ryujinx.HLE/OsHle/Services/Nfp/State.cs b/Ryujinx.HLE/OsHle/Services/Nfp/State.cs new file mode 100644 index 000000000..c1f0bb1a4 --- /dev/null +++ b/Ryujinx.HLE/OsHle/Services/Nfp/State.cs @@ -0,0 +1,8 @@ +namespace Ryujinx.HLE.OsHle.Services.Nfp +{ + enum State + { + NonInitialized = 0, + Initialized = 1 + } +} \ No newline at end of file diff --git a/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs b/Ryujinx.HLE/OsHle/Services/Nifm/IGeneralService.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs rename to Ryujinx.HLE/OsHle/Services/Nifm/IGeneralService.cs index 2e0083393..e289a8db8 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs +++ b/Ryujinx.HLE/OsHle/Services/Nifm/IGeneralService.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Nifm +namespace Ryujinx.HLE.OsHle.Services.Nifm { class IGeneralService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs b/Ryujinx.HLE/OsHle/Services/Nifm/IRequest.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs rename to Ryujinx.HLE/OsHle/Services/Nifm/IRequest.cs index 0d1aa5e40..c8c679c4c 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs +++ b/Ryujinx.HLE/OsHle/Services/Nifm/IRequest.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Nifm +namespace Ryujinx.HLE.OsHle.Services.Nifm { class IRequest : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Nifm/IStaticService.cs b/Ryujinx.HLE/OsHle/Services/Nifm/IStaticService.cs similarity index 91% rename from Ryujinx.Core/OsHle/Services/Nifm/IStaticService.cs rename to Ryujinx.HLE/OsHle/Services/Nifm/IStaticService.cs index b2fe0f976..c6d773f58 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/IStaticService.cs +++ b/Ryujinx.HLE/OsHle/Services/Nifm/IStaticService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Nifm +namespace Ryujinx.HLE.OsHle.Services.Nifm { class IStaticService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ns/IAddOnContentManager.cs b/Ryujinx.HLE/OsHle/Services/Ns/IAddOnContentManager.cs similarity index 91% rename from Ryujinx.Core/OsHle/Services/Ns/IAddOnContentManager.cs rename to Ryujinx.HLE/OsHle/Services/Ns/IAddOnContentManager.cs index 5163b3e13..f3e7146e5 100644 --- a/Ryujinx.Core/OsHle/Services/Ns/IAddOnContentManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Ns/IAddOnContentManager.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Ns +namespace Ryujinx.HLE.OsHle.Services.Ns { class IAddOnContentManager : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ns/IServiceGetterInterface.cs b/Ryujinx.HLE/OsHle/Services/Ns/IServiceGetterInterface.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Ns/IServiceGetterInterface.cs rename to Ryujinx.HLE/OsHle/Services/Ns/IServiceGetterInterface.cs index 603445f99..3650f8a42 100644 --- a/Ryujinx.Core/OsHle/Services/Ns/IServiceGetterInterface.cs +++ b/Ryujinx.HLE/OsHle/Services/Ns/IServiceGetterInterface.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Ns +namespace Ryujinx.HLE.OsHle.Services.Ns { class IServiceGetterInterface : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ns/ISystemUpdateInterface.cs b/Ryujinx.HLE/OsHle/Services/Ns/ISystemUpdateInterface.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Ns/ISystemUpdateInterface.cs rename to Ryujinx.HLE/OsHle/Services/Ns/ISystemUpdateInterface.cs index 4d9895ed9..adb6add9c 100644 --- a/Ryujinx.Core/OsHle/Services/Ns/ISystemUpdateInterface.cs +++ b/Ryujinx.HLE/OsHle/Services/Ns/ISystemUpdateInterface.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Ns +namespace Ryujinx.HLE.OsHle.Services.Ns { class ISystemUpdateInterface : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs b/Ryujinx.HLE/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs rename to Ryujinx.HLE/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs index 1091da0d3..6a2c3d3b5 100644 --- a/Ryujinx.Core/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs +++ b/Ryujinx.HLE/OsHle/Services/Ns/IVulnerabilityManagerInterface.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Ns +namespace Ryujinx.HLE.OsHle.Services.Ns { class IVulnerabilityManagerInterface : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs b/Ryujinx.HLE/OsHle/Services/Nv/INvDrvServices.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs rename to Ryujinx.HLE/OsHle/Services/Nv/INvDrvServices.cs index d67a6088d..5c1748bdb 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/INvDrvServices.cs @@ -1,16 +1,16 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.Services.Nv.NvGpuAS; -using Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu; -using Ryujinx.Core.OsHle.Services.Nv.NvHostChannel; -using Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl; -using Ryujinx.Core.OsHle.Services.Nv.NvMap; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS; +using Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu; +using Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel; +using Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl; +using Ryujinx.HLE.OsHle.Services.Nv.NvMap; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Nv +namespace Ryujinx.HLE.OsHle.Services.Nv { class INvDrvServices : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvFd.cs similarity index 79% rename from Ryujinx.Core/OsHle/Services/Nv/NvFd.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvFd.cs index 1fdbd1a17..96fce80a7 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvFd.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv +namespace Ryujinx.HLE.OsHle.Services.Nv { class NvFd { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs similarity index 79% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs index 7e652d1fc..9d955d625 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS { struct NvGpuASAllocSpace { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs index 726224711..c96c04c86 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs @@ -1,11 +1,11 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Gpu; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Services.Nv.NvMap; +using Ryujinx.HLE.Gpu; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Services.Nv.NvMap; using System; using System.Collections.Concurrent; -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS { class NvGpuASIoctl { @@ -140,11 +140,9 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS if (Size == 0) { - Size = Map.Size; + Size = (uint)Map.Size; } - Size = Map.Size; - int Result = NvResult.Success; //Note: When the fixed offset flag is not set, diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs similarity index 83% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs index b8bdd7069..f3ee40b66 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS { struct NvGpuASMapBufferEx { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs similarity index 81% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs index 363ae687e..e0ccb113b 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASRemap.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS { struct NvGpuASRemap { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs similarity index 59% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs index 8b6275117..790da3c26 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS { struct NvGpuASUnmapBuffer { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs similarity index 66% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs index 3294f5138..71edebbb9 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { struct NvGpuGpuGetActiveSlotMask { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs index 5d92b5083..a519fed1f 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { struct NvGpuGpuGetCharacteristics { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs similarity index 79% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs index 04c4c9cd4..17a7da621 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { struct NvGpuGpuGetTpcMasks { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs index bba78ea8a..c034994c6 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs @@ -1,9 +1,9 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; +using Ryujinx.HLE.Logging; using System; using System.Diagnostics; -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { class NvGpuGpuIoctl { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs similarity index 58% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs index 997cd42fe..21bcacebf 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { struct NvGpuGpuZcullGetCtxSize { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs index c4c5036d8..168051ed3 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu +namespace Ryujinx.HLE.OsHle.Services.Nv.NvGpuGpu { struct NvGpuGpuZcullGetInfo { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHelper.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHelper.cs similarity index 70% rename from Ryujinx.Core/OsHle/Services/Nv/NvHelper.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHelper.cs index c5cee361c..22f1fecce 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHelper.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHelper.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv +namespace Ryujinx.HLE.OsHle.Services.Nv { static class NvHelper { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs index 857218eae..c461fa282 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs @@ -1,10 +1,10 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Services.Nv.NvGpuAS; -using Ryujinx.Core.Gpu; +using Ryujinx.HLE.Gpu; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS; using System; -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel { class NvHostChannelIoctl { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs similarity index 78% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs index 4698a3da2..9541f7018 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel { struct NvHostChannelSubmitGpfifo { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs similarity index 99% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs index 1997f981f..a9fd9d3ab 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs @@ -1,10 +1,10 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; +using Ryujinx.HLE.Logging; using System; using System.Collections.Concurrent; using System.Threading; -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { class NvHostCtrlIoctl { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs similarity index 64% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs index 0b05e63aa..7801f467a 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { struct NvHostCtrlSyncptRead { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs similarity index 70% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs index 6746090ab..29a75dd7d 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { struct NvHostCtrlSyncptWait { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs similarity index 74% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs index 21ba37832..79f84214b 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { struct NvHostCtrlSyncptWaitEx { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs similarity index 88% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs index be71b2252..5d414a2e5 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { class NvHostCtrlUserCtx { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs similarity index 70% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs index 027e25b0c..bb294d727 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEvent.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { class NvHostEvent { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs similarity index 72% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs index a4bd2cb6b..fa4583b8c 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostEventState.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { enum NvHostEventState { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs index 96ae16a39..47d63f794 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvHostCtrl/NvHostSyncPt.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading; -namespace Ryujinx.Core.OsHle.Services.Nv.NvHostCtrl +namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostCtrl { class NvHostSyncpt { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapAlloc.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapAlloc.cs similarity index 81% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapAlloc.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapAlloc.cs index 86e4c2381..10634b860 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapAlloc.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapAlloc.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapAlloc { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapCreate.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapCreate.cs similarity index 65% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapCreate.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapCreate.cs index 7d35731ce..8f3be79d0 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapCreate.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapCreate.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapCreate { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFree.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFree.cs similarity index 78% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFree.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFree.cs index ee8bc618a..1e13f1974 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFree.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFree.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapFree { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFromId.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFromId.cs similarity index 65% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFromId.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFromId.cs index 377eaa7f0..31c751317 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapFromId.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapFromId.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapFromId { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapGetId.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapGetId.cs similarity index 64% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapGetId.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapGetId.cs index 639a5fb4c..780815d27 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapGetId.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapGetId.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapGetId { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandle.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandle.cs similarity index 93% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandle.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandle.cs index 4a021f6f3..7902034c6 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandle.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandle.cs @@ -1,6 +1,6 @@ using System.Threading; -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { class NvMapHandle { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs similarity index 76% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs index 80ff4c034..ab1b0577d 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapHandleParam.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { enum NvMapHandleParam { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapIoctl.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapIoctl.cs index aff2683ef..376b74c1e 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapIoctl.cs @@ -1,10 +1,10 @@ using ChocolArm64.Memory; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Utilities; -using Ryujinx.Core.Gpu; +using Ryujinx.HLE.Gpu; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Utilities; using System.Collections.Concurrent; -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { class NvMapIoctl { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapParam.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapParam.cs similarity index 71% rename from Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapParam.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapParam.cs index 196ef6aba..218cb700a 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapParam.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapParam.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv.NvMap +namespace Ryujinx.HLE.OsHle.Services.Nv.NvMap { struct NvMapParam { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvResult.cs b/Ryujinx.HLE/OsHle/Services/Nv/NvResult.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Nv/NvResult.cs rename to Ryujinx.HLE/OsHle/Services/Nv/NvResult.cs index 5a4191651..720f5ccf2 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvResult.cs +++ b/Ryujinx.HLE/OsHle/Services/Nv/NvResult.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Nv +namespace Ryujinx.HLE.OsHle.Services.Nv { static class NvResult { diff --git a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs rename to Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs index 28b35b0a3..eb363ade1 100644 --- a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs +++ b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Pctl +namespace Ryujinx.HLE.OsHle.Services.Pctl { class IParentalControlService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlServiceFactory.cs b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs similarity index 89% rename from Ryujinx.Core/OsHle/Services/Pctl/IParentalControlServiceFactory.cs rename to Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs index 5421f1655..094245f6b 100644 --- a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlServiceFactory.cs +++ b/Ryujinx.HLE/OsHle/Services/Pctl/IParentalControlServiceFactory.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Pctl +namespace Ryujinx.HLE.OsHle.Services.Pctl { class IParentalControlServiceFactory : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pl/ISharedFontManager.cs b/Ryujinx.HLE/OsHle/Services/Pl/ISharedFontManager.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/Pl/ISharedFontManager.cs rename to Ryujinx.HLE/OsHle/Services/Pl/ISharedFontManager.cs index 2872577f0..9f85f3d10 100644 --- a/Ryujinx.Core/OsHle/Services/Pl/ISharedFontManager.cs +++ b/Ryujinx.HLE/OsHle/Services/Pl/ISharedFontManager.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Pl +namespace Ryujinx.HLE.OsHle.Services.Pl { class ISharedFontManager : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs b/Ryujinx.HLE/OsHle/Services/Pl/SharedFontType.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs rename to Ryujinx.HLE/OsHle/Services/Pl/SharedFontType.cs index 2318b1729..97fd95dc9 100644 --- a/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs +++ b/Ryujinx.HLE/OsHle/Services/Pl/SharedFontType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Pl +namespace Ryujinx.HLE.OsHle.Services.Pl { enum SharedFontType { diff --git a/Ryujinx.Core/OsHle/Services/Prepo/IPrepoService.cs b/Ryujinx.HLE/OsHle/Services/Prepo/IPrepoService.cs similarity index 86% rename from Ryujinx.Core/OsHle/Services/Prepo/IPrepoService.cs rename to Ryujinx.HLE/OsHle/Services/Prepo/IPrepoService.cs index dbf01c6bd..f313921a7 100644 --- a/Ryujinx.Core/OsHle/Services/Prepo/IPrepoService.cs +++ b/Ryujinx.HLE/OsHle/Services/Prepo/IPrepoService.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Prepo +namespace Ryujinx.HLE.OsHle.Services.Prepo { class IPrepoService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs b/Ryujinx.HLE/OsHle/Services/ServiceFactory.cs similarity index 81% rename from Ryujinx.Core/OsHle/Services/ServiceFactory.cs rename to Ryujinx.HLE/OsHle/Services/ServiceFactory.cs index 05301d1ea..0720c5d25 100644 --- a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs +++ b/Ryujinx.HLE/OsHle/Services/ServiceFactory.cs @@ -1,27 +1,27 @@ -using Ryujinx.Core.OsHle.Services.Acc; -using Ryujinx.Core.OsHle.Services.Am; -using Ryujinx.Core.OsHle.Services.Apm; -using Ryujinx.Core.OsHle.Services.Aud; -using Ryujinx.Core.OsHle.Services.Bsd; -using Ryujinx.Core.OsHle.Services.Caps; -using Ryujinx.Core.OsHle.Services.Friend; -using Ryujinx.Core.OsHle.Services.FspSrv; -using Ryujinx.Core.OsHle.Services.Hid; -using Ryujinx.Core.OsHle.Services.Lm; -using Ryujinx.Core.OsHle.Services.Nfp; -using Ryujinx.Core.OsHle.Services.Ns; -using Ryujinx.Core.OsHle.Services.Nv; -using Ryujinx.Core.OsHle.Services.Pctl; -using Ryujinx.Core.OsHle.Services.Pl; -using Ryujinx.Core.OsHle.Services.Prepo; -using Ryujinx.Core.OsHle.Services.Set; -using Ryujinx.Core.OsHle.Services.Sfdnsres; -using Ryujinx.Core.OsHle.Services.Sm; -using Ryujinx.Core.OsHle.Services.Ssl; -using Ryujinx.Core.OsHle.Services.Vi; +using Ryujinx.HLE.OsHle.Services.Acc; +using Ryujinx.HLE.OsHle.Services.Am; +using Ryujinx.HLE.OsHle.Services.Apm; +using Ryujinx.HLE.OsHle.Services.Aud; +using Ryujinx.HLE.OsHle.Services.Bsd; +using Ryujinx.HLE.OsHle.Services.Caps; +using Ryujinx.HLE.OsHle.Services.Friend; +using Ryujinx.HLE.OsHle.Services.FspSrv; +using Ryujinx.HLE.OsHle.Services.Hid; +using Ryujinx.HLE.OsHle.Services.Lm; +using Ryujinx.HLE.OsHle.Services.Nfp; +using Ryujinx.HLE.OsHle.Services.Ns; +using Ryujinx.HLE.OsHle.Services.Nv; +using Ryujinx.HLE.OsHle.Services.Pctl; +using Ryujinx.HLE.OsHle.Services.Pl; +using Ryujinx.HLE.OsHle.Services.Prepo; +using Ryujinx.HLE.OsHle.Services.Set; +using Ryujinx.HLE.OsHle.Services.Sfdnsres; +using Ryujinx.HLE.OsHle.Services.Sm; +using Ryujinx.HLE.OsHle.Services.Ssl; +using Ryujinx.HLE.OsHle.Services.Vi; using System; -namespace Ryujinx.Core.OsHle.Services +namespace Ryujinx.HLE.OsHle.Services { static class ServiceFactory { diff --git a/Ryujinx.Core/OsHle/Services/Set/ISettingsServer.cs b/Ryujinx.HLE/OsHle/Services/Set/ISettingsServer.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/Set/ISettingsServer.cs rename to Ryujinx.HLE/OsHle/Services/Set/ISettingsServer.cs index fb3648dac..96297ad2b 100644 --- a/Ryujinx.Core/OsHle/Services/Set/ISettingsServer.cs +++ b/Ryujinx.HLE/OsHle/Services/Set/ISettingsServer.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Set +namespace Ryujinx.HLE.OsHle.Services.Set { class ISettingsServer : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Set/ISystemSettingsServer.cs b/Ryujinx.HLE/OsHle/Services/Set/ISystemSettingsServer.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Set/ISystemSettingsServer.cs rename to Ryujinx.HLE/OsHle/Services/Set/ISystemSettingsServer.cs index 1b6419fb1..6a3ea5378 100644 --- a/Ryujinx.Core/OsHle/Services/Set/ISystemSettingsServer.cs +++ b/Ryujinx.HLE/OsHle/Services/Set/ISystemSettingsServer.cs @@ -1,11 +1,11 @@ -using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.Settings; +using Ryujinx.HLE.OsHle.Ipc; +using Ryujinx.HLE.Settings; using System; using System.Collections.Generic; using System.IO; using System.Text; -namespace Ryujinx.Core.OsHle.Services.Set +namespace Ryujinx.HLE.OsHle.Services.Set { class ISystemSettingsServer : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Set/NxSettings.cs b/Ryujinx.HLE/OsHle/Services/Set/NxSettings.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Set/NxSettings.cs rename to Ryujinx.HLE/OsHle/Services/Set/NxSettings.cs index d7f1a1ffd..dc4a0b96f 100644 --- a/Ryujinx.Core/OsHle/Services/Set/NxSettings.cs +++ b/Ryujinx.HLE/OsHle/Services/Set/NxSettings.cs @@ -1,1711 +1,1711 @@ -using System.Collections.Generic; - -namespace Ryujinx.Core.OsHle.Services.Set -{ - static class NxSettings - { - //Generated automatically from a Switch 3.0 config file (Tid: 0100000000000818). - public static Dictionary Settings = new Dictionary() - { - { "account!na_required_for_network_service", true }, - { "account.daemon!background_awaking_periodicity", 10800 }, - { "account.daemon!schedule_periodicity", 3600 }, - { "account.daemon!profile_sync_interval", 18000 }, - { "account.daemon!na_info_refresh_interval", 46800 }, - { "am.display!transition_layer_enabled", true }, - { "am.gpu!gpu_scheduling_enabled", true }, - { "am.gpu!gpu_scheduling_frame_time_us", 116666 }, - { "am.gpu!gpu_scheduling_fg_app_us", 116166 }, - { "am.gpu!gpu_scheduling_bg_app_us", 104500 }, - { "am.gpu!gpu_scheduling_oa_us", 500 }, - { "am.gpu!gpu_scheduling_fg_sa_us", 11666 }, - { "am.gpu!gpu_scheduling_bg_sa_us", 0 }, - { "am.gpu!gpu_scheduling_fg_la_us", 11666 }, - { "am.gpu!gpu_scheduling_partial_fg_la_us", 2000 }, - { "am.gpu!gpu_scheduling_bg_la_us", 0 }, - { "audio!audren_log_enabled", false }, - { "audio!audout_log_enabled", false }, - { "audio!audin_log_enabled", false }, - { "audio!hwopus_log_enabled", false }, - { "audio!adsp_log_enabled", false }, - { "audio!suspend_for_debugger_enabled", false }, - { "audio!uac_speaker_enabled", false }, - { "bgtc!enable_halfawake", 1 }, - { "bgtc!enable_battery_saver", 1 }, - { "bgtc!leaving_halfawake_margin", 3 }, - { "bgtc!battery_threshold_save", 20 }, - { "bgtc!battery_threshold_stop", 20 }, - { "bgtc!minimum_interval_normal", 1800 }, - { "bgtc!minimum_interval_save", 86400 }, - { "boot!force_maintenance", false }, - { "capsrv!screenshot_layerstack", "screenshot" }, - { "capsrv!enable_album_screenshot_filedata_verification", true }, - { "devmenu!enable_application_update", true }, - { "devmenu!enable_exhibition_mode", false }, - { "eclct!analytics_override", false }, - { "eclct!analytics_pollperiod", 86400 }, - { "err!applet_auto_close", false }, - { "friends!background_processing", true }, - { "htc!disconnection_emulation", false }, - { "idle!dim_level_percent_lcd", 10 }, - { "idle!dim_level_percent_tv", 70 }, - { "lbl!force_disable_als", false }, - { "lm!enable_sd_card_logging", false }, - { "lm!sd_card_log_output_directory", "NxBinLogs" }, - { "mii!is_db_test_mode_enabled", false }, - { "news!system_version", 2 }, - { "nfp!not_locked_tag", true }, - { "nfp!play_report", false }, - { "nifm!is_communication_control_enabled_for_test", false }, - { "nifm!connection_test_timeout", 45000 }, - { "nifm!apply_config_timeout", 30000 }, - { "nifm!ethernet_adapter_standby_time", 10000 }, - { "nim.install!prefer_delta_evenif_inefficient", false }, - { "nim.install!apply_delta_stress_storage", 0 }, - { "ns.notification!retry_interval", 60 }, - { "ns.notification!enable_network_update", true }, - { "ns.notification!enable_download_task_list", true }, - { "ns.notification!enable_version_list", true }, - { "ns.notification!enable_random_wait", true }, - { "ns.notification!debug_waiting_limit", 0 }, - { "ns.notification!enable_request_on_cold_boot", true }, - { "ns.sdcard!mount_sdcard", true }, - { "ns.sdcard!compare_sdcard", 0 }, - { "ns.gamecard!mount_gamecard_result_value", 0 }, - { "ns.gamecard!try_gamecard_access_result_value", 0 }, - { "nv!00008600", "" }, - { "nv!0007b25e", "" }, - { "nv!0083e1", "" }, - { "nv!01621887", "" }, - { "nv!03134743", "" }, - { "nv!0356afd0", "" }, - { "nv!0356afd1", "" }, - { "nv!0356afd2", "" }, - { "nv!0356afd3", "" }, - { "nv!094313", "" }, - { "nv!0x04dc09", "" }, - { "nv!0x111133", "" }, - { "nv!0x1aa483", "" }, - { "nv!0x1cb1cf", "" }, - { "nv!0x1cb1d0", "" }, - { "nv!0x1e3221", "" }, - { "nv!0x300fc8", "" }, - { "nv!0x301fc8", "" }, - { "nv!0x302fc8", "" }, - { "nv!0x3eec59", "" }, - { "nv!0x46b3ed", "" }, - { "nv!0x523dc0", "" }, - { "nv!0x523dc1", "" }, - { "nv!0x523dc2", "" }, - { "nv!0x523dc3", "" }, - { "nv!0x523dc4", "" }, - { "nv!0x523dc5", "" }, - { "nv!0x523dc6", "" }, - { "nv!0x523dd0", "" }, - { "nv!0x523dd1", "" }, - { "nv!0x523dd3", "" }, - { "nv!0x5344bb", "" }, - { "nv!0x555237", "" }, - { "nv!0x58a234", "" }, - { "nv!0x7b4428", "" }, - { "nv!0x923dc0", "" }, - { "nv!0x923dc1", "" }, - { "nv!0x923dc2", "" }, - { "nv!0x923dc3", "" }, - { "nv!0x923dc4", "" }, - { "nv!0x923dd3", "" }, - { "nv!0x9abdc5", "" }, - { "nv!0x9abdc6", "" }, - { "nv!0xaaa36c", "" }, - { "nv!0xb09da0", "" }, - { "nv!0xb09da1", "" }, - { "nv!0xb09da2", "" }, - { "nv!0xb09da3", "" }, - { "nv!0xb09da4", "" }, - { "nv!0xb09da5", "" }, - { "nv!0xb0b348", "" }, - { "nv!0xb0b349", "" }, - { "nv!0xbb558f", "" }, - { "nv!0xbd10fb", "" }, - { "nv!0xc32ad3", "" }, - { "nv!0xce2348", "" }, - { "nv!0xcfd81f", "" }, - { "nv!0xe0036b", "" }, - { "nv!0xe01f2d", "" }, - { "nv!0xe17212", "" }, - { "nv!0xeae966", "" }, - { "nv!0xed4f82", "" }, - { "nv!0xf12335", "" }, - { "nv!0xf12336", "" }, - { "nv!10261989", "" }, - { "nv!1042d483", "" }, - { "nv!10572898", "" }, - { "nv!115631", "" }, - { "nv!12950094", "" }, - { "nv!1314f311", "" }, - { "nv!1314f312", "" }, - { "nv!13279512", "" }, - { "nv!13813496", "" }, - { "nv!14507179", "" }, - { "nv!15694569", "" }, - { "nv!16936964", "" }, - { "nv!17aa230c", "" }, - { "nv!182054", "" }, - { "nv!18273275", "" }, - { "nv!18273276", "" }, - { "nv!1854d03b", "" }, - { "nv!18add00d", "" }, - { "nv!19156670", "" }, - { "nv!19286545", "" }, - { "nv!1a298e9f", "" }, - { "nv!1acf43fe", "" }, - { "nv!1bda43fe", "" }, - { "nv!1c3b92", "" }, - { "nv!21509920", "" }, - { "nv!215323457", "" }, - { "nv!2165ad", "" }, - { "nv!2165ae", "" }, - { "nv!21be9c", "" }, - { "nv!233264316", "" }, - { "nv!234557580", "" }, - { "nv!23cd0e", "" }, - { "nv!24189123", "" }, - { "nv!2443266", "" }, - { "nv!25025519", "" }, - { "nv!255e39", "" }, - { "nv!2583364", "" }, - { "nv!2888c1", "" }, - { "nv!28ca3e", "" }, - { "nv!29871243", "" }, - { "nv!2a1f64", "" }, - { "nv!2dc432", "" }, - { "nv!2de437", "" }, - { "nv!2f3bb89c", "" }, - { "nv!2fd652", "" }, - { "nv!3001ac", "" }, - { "nv!31298772", "" }, - { "nv!313233", "" }, - { "nv!31f7d603", "" }, - { "nv!320ce4", "" }, - { "nv!32153248", "" }, - { "nv!32153249", "" }, - { "nv!335bca", "" }, - { "nv!342abb", "" }, - { "nv!34dfe6", "" }, - { "nv!34dfe7", "" }, - { "nv!34dfe8", "" }, - { "nv!34dfe9", "" }, - { "nv!35201578", "" }, - { "nv!359278", "" }, - { "nv!37f53a", "" }, - { "nv!38144972", "" }, - { "nv!38542646", "" }, - { "nv!3b74c9", "" }, - { "nv!3c136f", "" }, - { "nv!3cf72823", "" }, - { "nv!3d7af029", "" }, - { "nv!3ff34782", "" }, - { "nv!4129618", "" }, - { "nv!4189fac3", "" }, - { "nv!420bd4", "" }, - { "nv!42a699", "" }, - { "nv!441369", "" }, - { "nv!4458713e", "" }, - { "nv!4554b6", "" }, - { "nv!457425", "" }, - { "nv!4603b207", "" }, - { "nv!46574957", "" }, - { "nv!46574958", "" }, - { "nv!46813529", "" }, - { "nv!46f1e13d", "" }, - { "nv!47534c43", "" }, - { "nv!48550336", "" }, - { "nv!48576893", "" }, - { "nv!48576894", "" }, - { "nv!4889ac02", "" }, - { "nv!49005740", "" }, - { "nv!49867584", "" }, - { "nv!49960973", "" }, - { "nv!4a5341", "" }, - { "nv!4f4e48", "" }, - { "nv!4f8a0a", "" }, - { "nv!50299698", "" }, - { "nv!50299699", "" }, - { "nv!50361291", "" }, - { "nv!5242ae", "" }, - { "nv!53d30c", "" }, - { "nv!56347a", "" }, - { "nv!563a95f1", "" }, - { "nv!573823", "" }, - { "nv!58027529", "" }, - { "nv!5d2d63", "" }, - { "nv!5f7e3b", "" }, - { "nv!60461793", "" }, - { "nv!60d355", "" }, - { "nv!616627aa", "" }, - { "nv!62317182", "" }, - { "nv!6253fa2e", "" }, - { "nv!64100768", "" }, - { "nv!64100769", "" }, - { "nv!64100770", "" }, - { "nv!647395", "" }, - { "nv!66543234", "" }, - { "nv!67674763", "" }, - { "nv!67739784", "" }, - { "nv!68fb9c", "" }, - { "nv!69801276", "" }, - { "nv!6af9fa2f", "" }, - { "nv!6af9fa3f", "" }, - { "nv!6af9fa4f", "" }, - { "nv!6bd8c7", "" }, - { "nv!6c7691", "" }, - { "nv!6d4296ce", "" }, - { "nv!6dd7e7", "" }, - { "nv!6dd7e8", "" }, - { "nv!6fe11ec1", "" }, - { "nv!716511763", "" }, - { "nv!72504593", "" }, - { "nv!73304097", "" }, - { "nv!73314098", "" }, - { "nv!74095213", "" }, - { "nv!74095213a", "" }, - { "nv!74095213b", "" }, - { "nv!74095214", "" }, - { "nv!748f9649", "" }, - { "nv!75494732", "" }, - { "nv!78452832", "" }, - { "nv!784561", "" }, - { "nv!78e16b9c", "" }, - { "nv!79251225", "" }, - { "nv!7c128b", "" }, - { "nv!7ccd93", "" }, - { "nv!7df8d1", "" }, - { "nv!800c2310", "" }, - { "nv!80546710", "" }, - { "nv!80772310", "" }, - { "nv!808ee280", "" }, - { "nv!81131154", "" }, - { "nv!81274457", "" }, - { "nv!8292291f", "" }, - { "nv!83498426", "" }, - { "nv!84993794", "" }, - { "nv!84995585", "" }, - { "nv!84a0a0", "" }, - { "nv!852142", "" }, - { "nv!85612309", "" }, - { "nv!85612310", "" }, - { "nv!85612311", "" }, - { "nv!85612312", "" }, - { "nv!8623ff27", "" }, - { "nv!87364952", "" }, - { "nv!87f6275666", "" }, - { "nv!886748", "" }, - { "nv!89894423", "" }, - { "nv!8ad8a75", "" }, - { "nv!8ad8ad00", "" }, - { "nv!8bb815", "" }, - { "nv!8bb817", "" }, - { "nv!8bb818", "" }, - { "nv!8bb819", "" }, - { "nv!8e640cd1", "" }, - { "nv!8f34971a", "" }, - { "nv!8f773984", "" }, - { "nv!8f7a7d", "" }, - { "nv!902486209", "" }, - { "nv!90482571", "" }, - { "nv!91214835", "" }, - { "nv!912848290", "" }, - { "nv!915e56", "" }, - { "nv!92179063", "" }, - { "nv!92179064", "" }, - { "nv!92179065", "" }, - { "nv!92179066", "" }, - { "nv!92350358", "" }, - { "nv!92809063", "" }, - { "nv!92809064", "" }, - { "nv!92809065", "" }, - { "nv!92809066", "" }, - { "nv!92920143", "" }, - { "nv!93a89b12", "" }, - { "nv!93a89c0b", "" }, - { "nv!94812574", "" }, - { "nv!95282304", "" }, - { "nv!95394027", "" }, - { "nv!959b1f", "" }, - { "nv!9638af", "" }, - { "nv!96fd59", "" }, - { "nv!97f6275666", "" }, - { "nv!97f6275667", "" }, - { "nv!97f6275668", "" }, - { "nv!97f6275669", "" }, - { "nv!97f627566a", "" }, - { "nv!97f627566b", "" }, - { "nv!97f627566d", "" }, - { "nv!97f627566e", "" }, - { "nv!97f627566f", "" }, - { "nv!97f6275670", "" }, - { "nv!97f6275671", "" }, - { "nv!97f727566e", "" }, - { "nv!98480775", "" }, - { "nv!98480776", "" }, - { "nv!98480777", "" }, - { "nv!992431", "" }, - { "nv!9aa29065", "" }, - { "nv!9af32c", "" }, - { "nv!9af32d", "" }, - { "nv!9af32e", "" }, - { "nv!9c108b71", "" }, - { "nv!9f279065", "" }, - { "nv!a01bc728", "" }, - { "nv!a13b46c80", "" }, - { "nv!a22eb0", "" }, - { "nv!a2fb451e", "" }, - { "nv!a3456abe", "" }, - { "nv!a7044887", "" }, - { "nv!a7149200", "" }, - { "nv!a766215670", "" }, - { "nv!aac_drc_boost", "" }, - { "nv!aac_drc_cut", "" }, - { "nv!aac_drc_enc_target_level", "" }, - { "nv!aac_drc_heavy", "" }, - { "nv!aac_drc_reference_level", "" }, - { "nv!aalinegamma", "" }, - { "nv!aalinetweaks", "" }, - { "nv!ab34ee01", "" }, - { "nv!ab34ee02", "" }, - { "nv!ab34ee03", "" }, - { "nv!ac0274", "" }, - { "nv!af73c63e", "" }, - { "nv!af73c63f", "" }, - { "nv!af9927", "" }, - { "nv!afoverride", "" }, - { "nv!allocdeviceevents", "" }, - { "nv!applicationkey", "" }, - { "nv!appreturnonlybasicglsltype", "" }, - { "nv!app_softimage", "" }, - { "nv!app_supportbits2", "" }, - { "nv!assumetextureismipmappedatcreation", "" }, - { "nv!b1fb0f01", "" }, - { "nv!b3edd5", "" }, - { "nv!b40d9e03d", "" }, - { "nv!b7f6275666", "" }, - { "nv!b812c1", "" }, - { "nv!ba14ba1a", "" }, - { "nv!ba14ba1b", "" }, - { "nv!bd7559", "" }, - { "nv!bd755a", "" }, - { "nv!bd755c", "" }, - { "nv!bd755d", "" }, - { "nv!be58bb", "" }, - { "nv!be92cb", "" }, - { "nv!beefcba3", "" }, - { "nv!beefcba4", "" }, - { "nv!c023777f", "" }, - { "nv!c09dc8", "" }, - { "nv!c0d340", "" }, - { "nv!c2ff374c", "" }, - { "nv!c5e9d7a3", "" }, - { "nv!c5e9d7a4", "" }, - { "nv!c5e9d7b4", "" }, - { "nv!c618f9", "" }, - { "nv!ca345840", "" }, - { "nv!cachedisable", "" }, - { "nv!cast.on", "" }, - { "nv!cde", "" }, - { "nv!channelpriorityoverride", "" }, - { "nv!cleardatastorevidmem", "" }, - { "nv!cmdbufmemoryspaceenables", "" }, - { "nv!cmdbufminwords", "" }, - { "nv!cmdbufsizewords", "" }, - { "nv!conformantblitframebufferscissor", "" }, - { "nv!conformantincompletetextures", "" }, - { "nv!copybuffermethod", "" }, - { "nv!cubemapaniso", "" }, - { "nv!cubemapfiltering", "" }, - { "nv!d0e9a4d7", "" }, - { "nv!d13733f12", "" }, - { "nv!d1b399", "" }, - { "nv!d2983c32", "" }, - { "nv!d2983c33", "" }, - { "nv!d2e71b", "" }, - { "nv!d377dc", "" }, - { "nv!d377dd", "" }, - { "nv!d489f4", "" }, - { "nv!d4bce1", "" }, - { "nv!d518cb", "" }, - { "nv!d518cd", "" }, - { "nv!d518ce", "" }, - { "nv!d518d0", "" }, - { "nv!d518d1", "" }, - { "nv!d518d2", "" }, - { "nv!d518d3", "" }, - { "nv!d518d4", "" }, - { "nv!d518d5", "" }, - { "nv!d59eda", "" }, - { "nv!d83cbd", "" }, - { "nv!d8e777", "" }, - { "nv!debug_level", "" }, - { "nv!debug_mask", "" }, - { "nv!debug_options", "" }, - { "nv!devshmpageableallocations", "" }, - { "nv!df1f9812", "" }, - { "nv!df783c", "" }, - { "nv!diagenable", "" }, - { "nv!disallowcemask", "" }, - { "nv!disallowz16", "" }, - { "nv!dlmemoryspaceenables", "" }, - { "nv!e0bfec", "" }, - { "nv!e433456d", "" }, - { "nv!e435563f", "" }, - { "nv!e4cd9c", "" }, - { "nv!e5c972", "" }, - { "nv!e639ef", "" }, - { "nv!e802af", "" }, - { "nv!eae964", "" }, - { "nv!earlytexturehwallocation", "" }, - { "nv!eb92a3", "" }, - { "nv!ebca56", "" }, - { "nv!enable-noaud", "" }, - { "nv!enable-noavs", "" }, - { "nv!enable-prof", "" }, - { "nv!enable-sxesmode", "" }, - { "nv!enable-ulld", "" }, - { "nv!expert_detail_level", "" }, - { "nv!expert_output_mask", "" }, - { "nv!expert_report_mask", "" }, - { "nv!extensionstringnvarch", "" }, - { "nv!extensionstringversion", "" }, - { "nv!f00f1938", "" }, - { "nv!f10736", "" }, - { "nv!f1846870", "" }, - { "nv!f33bc370", "" }, - { "nv!f392a874", "" }, - { "nv!f49ae8", "" }, - { "nv!fa345cce", "" }, - { "nv!fa35cc4", "" }, - { "nv!faa14a", "" }, - { "nv!faf8a723", "" }, - { "nv!fastgs", "" }, - { "nv!fbf4ac45", "" }, - { "nv!fbo_blit_ignore_srgb", "" }, - { "nv!fc64c7", "" }, - { "nv!ff54ec97", "" }, - { "nv!ff54ec98", "" }, - { "nv!forceexitprocessdetach", "" }, - { "nv!forcerequestedesversion", "" }, - { "nv!__gl_", "" }, - { "nv!__gl_00008600", "" }, - { "nv!__gl_0007b25e", "" }, - { "nv!__gl_0083e1", "" }, - { "nv!__gl_01621887", "" }, - { "nv!__gl_03134743", "" }, - { "nv!__gl_0356afd0", "" }, - { "nv!__gl_0356afd1", "" }, - { "nv!__gl_0356afd2", "" }, - { "nv!__gl_0356afd3", "" }, - { "nv!__gl_094313", "" }, - { "nv!__gl_0x04dc09", "" }, - { "nv!__gl_0x111133", "" }, - { "nv!__gl_0x1aa483", "" }, - { "nv!__gl_0x1cb1cf", "" }, - { "nv!__gl_0x1cb1d0", "" }, - { "nv!__gl_0x1e3221", "" }, - { "nv!__gl_0x300fc8", "" }, - { "nv!__gl_0x301fc8", "" }, - { "nv!__gl_0x302fc8", "" }, - { "nv!__gl_0x3eec59", "" }, - { "nv!__gl_0x46b3ed", "" }, - { "nv!__gl_0x523dc0", "" }, - { "nv!__gl_0x523dc1", "" }, - { "nv!__gl_0x523dc2", "" }, - { "nv!__gl_0x523dc3", "" }, - { "nv!__gl_0x523dc4", "" }, - { "nv!__gl_0x523dc5", "" }, - { "nv!__gl_0x523dc6", "" }, - { "nv!__gl_0x523dd0", "" }, - { "nv!__gl_0x523dd1", "" }, - { "nv!__gl_0x523dd3", "" }, - { "nv!__gl_0x5344bb", "" }, - { "nv!__gl_0x555237", "" }, - { "nv!__gl_0x58a234", "" }, - { "nv!__gl_0x7b4428", "" }, - { "nv!__gl_0x923dc0", "" }, - { "nv!__gl_0x923dc1", "" }, - { "nv!__gl_0x923dc2", "" }, - { "nv!__gl_0x923dc3", "" }, - { "nv!__gl_0x923dc4", "" }, - { "nv!__gl_0x923dd3", "" }, - { "nv!__gl_0x9abdc5", "" }, - { "nv!__gl_0x9abdc6", "" }, - { "nv!__gl_0xaaa36c", "" }, - { "nv!__gl_0xb09da0", "" }, - { "nv!__gl_0xb09da1", "" }, - { "nv!__gl_0xb09da2", "" }, - { "nv!__gl_0xb09da3", "" }, - { "nv!__gl_0xb09da4", "" }, - { "nv!__gl_0xb09da5", "" }, - { "nv!__gl_0xb0b348", "" }, - { "nv!__gl_0xb0b349", "" }, - { "nv!__gl_0xbb558f", "" }, - { "nv!__gl_0xbd10fb", "" }, - { "nv!__gl_0xc32ad3", "" }, - { "nv!__gl_0xce2348", "" }, - { "nv!__gl_0xcfd81f", "" }, - { "nv!__gl_0xe0036b", "" }, - { "nv!__gl_0xe01f2d", "" }, - { "nv!__gl_0xe17212", "" }, - { "nv!__gl_0xeae966", "" }, - { "nv!__gl_0xed4f82", "" }, - { "nv!__gl_0xf12335", "" }, - { "nv!__gl_0xf12336", "" }, - { "nv!__gl_10261989", "" }, - { "nv!__gl_1042d483", "" }, - { "nv!__gl_10572898", "" }, - { "nv!__gl_115631", "" }, - { "nv!__gl_12950094", "" }, - { "nv!__gl_1314f311", "" }, - { "nv!__gl_1314f312", "" }, - { "nv!__gl_13279512", "" }, - { "nv!__gl_13813496", "" }, - { "nv!__gl_14507179", "" }, - { "nv!__gl_15694569", "" }, - { "nv!__gl_16936964", "" }, - { "nv!__gl_17aa230c", "" }, - { "nv!__gl_182054", "" }, - { "nv!__gl_18273275", "" }, - { "nv!__gl_18273276", "" }, - { "nv!__gl_1854d03b", "" }, - { "nv!__gl_18add00d", "" }, - { "nv!__gl_19156670", "" }, - { "nv!__gl_19286545", "" }, - { "nv!__gl_1a298e9f", "" }, - { "nv!__gl_1acf43fe", "" }, - { "nv!__gl_1bda43fe", "" }, - { "nv!__gl_1c3b92", "" }, - { "nv!__gl_21509920", "" }, - { "nv!__gl_215323457", "" }, - { "nv!__gl_2165ad", "" }, - { "nv!__gl_2165ae", "" }, - { "nv!__gl_21be9c", "" }, - { "nv!__gl_233264316", "" }, - { "nv!__gl_234557580", "" }, - { "nv!__gl_23cd0e", "" }, - { "nv!__gl_24189123", "" }, - { "nv!__gl_2443266", "" }, - { "nv!__gl_25025519", "" }, - { "nv!__gl_255e39", "" }, - { "nv!__gl_2583364", "" }, - { "nv!__gl_2888c1", "" }, - { "nv!__gl_28ca3e", "" }, - { "nv!__gl_29871243", "" }, - { "nv!__gl_2a1f64", "" }, - { "nv!__gl_2dc432", "" }, - { "nv!__gl_2de437", "" }, - { "nv!__gl_2f3bb89c", "" }, - { "nv!__gl_2fd652", "" }, - { "nv!__gl_3001ac", "" }, - { "nv!__gl_31298772", "" }, - { "nv!__gl_313233", "" }, - { "nv!__gl_31f7d603", "" }, - { "nv!__gl_320ce4", "" }, - { "nv!__gl_32153248", "" }, - { "nv!__gl_32153249", "" }, - { "nv!__gl_335bca", "" }, - { "nv!__gl_342abb", "" }, - { "nv!__gl_34dfe6", "" }, - { "nv!__gl_34dfe7", "" }, - { "nv!__gl_34dfe8", "" }, - { "nv!__gl_34dfe9", "" }, - { "nv!__gl_35201578", "" }, - { "nv!__gl_359278", "" }, - { "nv!__gl_37f53a", "" }, - { "nv!__gl_38144972", "" }, - { "nv!__gl_38542646", "" }, - { "nv!__gl_3b74c9", "" }, - { "nv!__gl_3c136f", "" }, - { "nv!__gl_3cf72823", "" }, - { "nv!__gl_3d7af029", "" }, - { "nv!__gl_3ff34782", "" }, - { "nv!__gl_4129618", "" }, - { "nv!__gl_4189fac3", "" }, - { "nv!__gl_420bd4", "" }, - { "nv!__gl_42a699", "" }, - { "nv!__gl_441369", "" }, - { "nv!__gl_4458713e", "" }, - { "nv!__gl_4554b6", "" }, - { "nv!__gl_457425", "" }, - { "nv!__gl_4603b207", "" }, - { "nv!__gl_46574957", "" }, - { "nv!__gl_46574958", "" }, - { "nv!__gl_46813529", "" }, - { "nv!__gl_46f1e13d", "" }, - { "nv!__gl_47534c43", "" }, - { "nv!__gl_48550336", "" }, - { "nv!__gl_48576893", "" }, - { "nv!__gl_48576894", "" }, - { "nv!__gl_4889ac02", "" }, - { "nv!__gl_49005740", "" }, - { "nv!__gl_49867584", "" }, - { "nv!__gl_49960973", "" }, - { "nv!__gl_4a5341", "" }, - { "nv!__gl_4f4e48", "" }, - { "nv!__gl_4f8a0a", "" }, - { "nv!__gl_50299698", "" }, - { "nv!__gl_50299699", "" }, - { "nv!__gl_50361291", "" }, - { "nv!__gl_5242ae", "" }, - { "nv!__gl_53d30c", "" }, - { "nv!__gl_56347a", "" }, - { "nv!__gl_563a95f1", "" }, - { "nv!__gl_573823", "" }, - { "nv!__gl_58027529", "" }, - { "nv!__gl_5d2d63", "" }, - { "nv!__gl_5f7e3b", "" }, - { "nv!__gl_60461793", "" }, - { "nv!__gl_60d355", "" }, - { "nv!__gl_616627aa", "" }, - { "nv!__gl_62317182", "" }, - { "nv!__gl_6253fa2e", "" }, - { "nv!__gl_64100768", "" }, - { "nv!__gl_64100769", "" }, - { "nv!__gl_64100770", "" }, - { "nv!__gl_647395", "" }, - { "nv!__gl_66543234", "" }, - { "nv!__gl_67674763", "" }, - { "nv!__gl_67739784", "" }, - { "nv!__gl_68fb9c", "" }, - { "nv!__gl_69801276", "" }, - { "nv!__gl_6af9fa2f", "" }, - { "nv!__gl_6af9fa3f", "" }, - { "nv!__gl_6af9fa4f", "" }, - { "nv!__gl_6bd8c7", "" }, - { "nv!__gl_6c7691", "" }, - { "nv!__gl_6d4296ce", "" }, - { "nv!__gl_6dd7e7", "" }, - { "nv!__gl_6dd7e8", "" }, - { "nv!__gl_6fe11ec1", "" }, - { "nv!__gl_716511763", "" }, - { "nv!__gl_72504593", "" }, - { "nv!__gl_73304097", "" }, - { "nv!__gl_73314098", "" }, - { "nv!__gl_74095213", "" }, - { "nv!__gl_74095213a", "" }, - { "nv!__gl_74095213b", "" }, - { "nv!__gl_74095214", "" }, - { "nv!__gl_748f9649", "" }, - { "nv!__gl_75494732", "" }, - { "nv!__gl_78452832", "" }, - { "nv!__gl_784561", "" }, - { "nv!__gl_78e16b9c", "" }, - { "nv!__gl_79251225", "" }, - { "nv!__gl_7c128b", "" }, - { "nv!__gl_7ccd93", "" }, - { "nv!__gl_7df8d1", "" }, - { "nv!__gl_800c2310", "" }, - { "nv!__gl_80546710", "" }, - { "nv!__gl_80772310", "" }, - { "nv!__gl_808ee280", "" }, - { "nv!__gl_81131154", "" }, - { "nv!__gl_81274457", "" }, - { "nv!__gl_8292291f", "" }, - { "nv!__gl_83498426", "" }, - { "nv!__gl_84993794", "" }, - { "nv!__gl_84995585", "" }, - { "nv!__gl_84a0a0", "" }, - { "nv!__gl_852142", "" }, - { "nv!__gl_85612309", "" }, - { "nv!__gl_85612310", "" }, - { "nv!__gl_85612311", "" }, - { "nv!__gl_85612312", "" }, - { "nv!__gl_8623ff27", "" }, - { "nv!__gl_87364952", "" }, - { "nv!__gl_87f6275666", "" }, - { "nv!__gl_886748", "" }, - { "nv!__gl_89894423", "" }, - { "nv!__gl_8ad8a75", "" }, - { "nv!__gl_8ad8ad00", "" }, - { "nv!__gl_8bb815", "" }, - { "nv!__gl_8bb817", "" }, - { "nv!__gl_8bb818", "" }, - { "nv!__gl_8bb819", "" }, - { "nv!__gl_8e640cd1", "" }, - { "nv!__gl_8f34971a", "" }, - { "nv!__gl_8f773984", "" }, - { "nv!__gl_8f7a7d", "" }, - { "nv!__gl_902486209", "" }, - { "nv!__gl_90482571", "" }, - { "nv!__gl_91214835", "" }, - { "nv!__gl_912848290", "" }, - { "nv!__gl_915e56", "" }, - { "nv!__gl_92179063", "" }, - { "nv!__gl_92179064", "" }, - { "nv!__gl_92179065", "" }, - { "nv!__gl_92179066", "" }, - { "nv!__gl_92350358", "" }, - { "nv!__gl_92809063", "" }, - { "nv!__gl_92809064", "" }, - { "nv!__gl_92809065", "" }, - { "nv!__gl_92809066", "" }, - { "nv!__gl_92920143", "" }, - { "nv!__gl_93a89b12", "" }, - { "nv!__gl_93a89c0b", "" }, - { "nv!__gl_94812574", "" }, - { "nv!__gl_95282304", "" }, - { "nv!__gl_95394027", "" }, - { "nv!__gl_959b1f", "" }, - { "nv!__gl_9638af", "" }, - { "nv!__gl_96fd59", "" }, - { "nv!__gl_97f6275666", "" }, - { "nv!__gl_97f6275667", "" }, - { "nv!__gl_97f6275668", "" }, - { "nv!__gl_97f6275669", "" }, - { "nv!__gl_97f627566a", "" }, - { "nv!__gl_97f627566b", "" }, - { "nv!__gl_97f627566d", "" }, - { "nv!__gl_97f627566e", "" }, - { "nv!__gl_97f627566f", "" }, - { "nv!__gl_97f6275670", "" }, - { "nv!__gl_97f6275671", "" }, - { "nv!__gl_97f727566e", "" }, - { "nv!__gl_98480775", "" }, - { "nv!__gl_98480776", "" }, - { "nv!__gl_98480777", "" }, - { "nv!__gl_992431", "" }, - { "nv!__gl_9aa29065", "" }, - { "nv!__gl_9af32c", "" }, - { "nv!__gl_9af32d", "" }, - { "nv!__gl_9af32e", "" }, - { "nv!__gl_9c108b71", "" }, - { "nv!__gl_9f279065", "" }, - { "nv!__gl_a01bc728", "" }, - { "nv!__gl_a13b46c80", "" }, - { "nv!__gl_a22eb0", "" }, - { "nv!__gl_a2fb451e", "" }, - { "nv!__gl_a3456abe", "" }, - { "nv!__gl_a7044887", "" }, - { "nv!__gl_a7149200", "" }, - { "nv!__gl_a766215670", "" }, - { "nv!__gl_aalinegamma", "" }, - { "nv!__gl_aalinetweaks", "" }, - { "nv!__gl_ab34ee01", "" }, - { "nv!__gl_ab34ee02", "" }, - { "nv!__gl_ab34ee03", "" }, - { "nv!__gl_ac0274", "" }, - { "nv!__gl_af73c63e", "" }, - { "nv!__gl_af73c63f", "" }, - { "nv!__gl_af9927", "" }, - { "nv!__gl_afoverride", "" }, - { "nv!__gl_allocdeviceevents", "" }, - { "nv!__gl_applicationkey", "" }, - { "nv!__gl_appreturnonlybasicglsltype", "" }, - { "nv!__gl_app_softimage", "" }, - { "nv!__gl_app_supportbits2", "" }, - { "nv!__gl_assumetextureismipmappedatcreation", "" }, - { "nv!__gl_b1fb0f01", "" }, - { "nv!__gl_b3edd5", "" }, - { "nv!__gl_b40d9e03d", "" }, - { "nv!__gl_b7f6275666", "" }, - { "nv!__gl_b812c1", "" }, - { "nv!__gl_ba14ba1a", "" }, - { "nv!__gl_ba14ba1b", "" }, - { "nv!__gl_bd7559", "" }, - { "nv!__gl_bd755a", "" }, - { "nv!__gl_bd755c", "" }, - { "nv!__gl_bd755d", "" }, - { "nv!__gl_be58bb", "" }, - { "nv!__gl_be92cb", "" }, - { "nv!__gl_beefcba3", "" }, - { "nv!__gl_beefcba4", "" }, - { "nv!__gl_c023777f", "" }, - { "nv!__gl_c09dc8", "" }, - { "nv!__gl_c0d340", "" }, - { "nv!__gl_c2ff374c", "" }, - { "nv!__gl_c5e9d7a3", "" }, - { "nv!__gl_c5e9d7a4", "" }, - { "nv!__gl_c5e9d7b4", "" }, - { "nv!__gl_c618f9", "" }, - { "nv!__gl_ca345840", "" }, - { "nv!__gl_cachedisable", "" }, - { "nv!__gl_channelpriorityoverride", "" }, - { "nv!__gl_cleardatastorevidmem", "" }, - { "nv!__gl_cmdbufmemoryspaceenables", "" }, - { "nv!__gl_cmdbufminwords", "" }, - { "nv!__gl_cmdbufsizewords", "" }, - { "nv!__gl_conformantblitframebufferscissor", "" }, - { "nv!__gl_conformantincompletetextures", "" }, - { "nv!__gl_copybuffermethod", "" }, - { "nv!__gl_cubemapaniso", "" }, - { "nv!__gl_cubemapfiltering", "" }, - { "nv!__gl_d0e9a4d7", "" }, - { "nv!__gl_d13733f12", "" }, - { "nv!__gl_d1b399", "" }, - { "nv!__gl_d2983c32", "" }, - { "nv!__gl_d2983c33", "" }, - { "nv!__gl_d2e71b", "" }, - { "nv!__gl_d377dc", "" }, - { "nv!__gl_d377dd", "" }, - { "nv!__gl_d489f4", "" }, - { "nv!__gl_d4bce1", "" }, - { "nv!__gl_d518cb", "" }, - { "nv!__gl_d518cd", "" }, - { "nv!__gl_d518ce", "" }, - { "nv!__gl_d518d0", "" }, - { "nv!__gl_d518d1", "" }, - { "nv!__gl_d518d2", "" }, - { "nv!__gl_d518d3", "" }, - { "nv!__gl_d518d4", "" }, - { "nv!__gl_d518d5", "" }, - { "nv!__gl_d59eda", "" }, - { "nv!__gl_d83cbd", "" }, - { "nv!__gl_d8e777", "" }, - { "nv!__gl_debug_level", "" }, - { "nv!__gl_debug_mask", "" }, - { "nv!__gl_debug_options", "" }, - { "nv!__gl_devshmpageableallocations", "" }, - { "nv!__gl_df1f9812", "" }, - { "nv!__gl_df783c", "" }, - { "nv!__gl_diagenable", "" }, - { "nv!__gl_disallowcemask", "" }, - { "nv!__gl_disallowz16", "" }, - { "nv!__gl_dlmemoryspaceenables", "" }, - { "nv!__gl_e0bfec", "" }, - { "nv!__gl_e433456d", "" }, - { "nv!__gl_e435563f", "" }, - { "nv!__gl_e4cd9c", "" }, - { "nv!__gl_e5c972", "" }, - { "nv!__gl_e639ef", "" }, - { "nv!__gl_e802af", "" }, - { "nv!__gl_eae964", "" }, - { "nv!__gl_earlytexturehwallocation", "" }, - { "nv!__gl_eb92a3", "" }, - { "nv!__gl_ebca56", "" }, - { "nv!__gl_expert_detail_level", "" }, - { "nv!__gl_expert_output_mask", "" }, - { "nv!__gl_expert_report_mask", "" }, - { "nv!__gl_extensionstringnvarch", "" }, - { "nv!__gl_extensionstringversion", "" }, - { "nv!__gl_f00f1938", "" }, - { "nv!__gl_f10736", "" }, - { "nv!__gl_f1846870", "" }, - { "nv!__gl_f33bc370", "" }, - { "nv!__gl_f392a874", "" }, - { "nv!__gl_f49ae8", "" }, - { "nv!__gl_fa345cce", "" }, - { "nv!__gl_fa35cc4", "" }, - { "nv!__gl_faa14a", "" }, - { "nv!__gl_faf8a723", "" }, - { "nv!__gl_fastgs", "" }, - { "nv!__gl_fbf4ac45", "" }, - { "nv!__gl_fbo_blit_ignore_srgb", "" }, - { "nv!__gl_fc64c7", "" }, - { "nv!__gl_ff54ec97", "" }, - { "nv!__gl_ff54ec98", "" }, - { "nv!__gl_forceexitprocessdetach", "" }, - { "nv!__gl_forcerequestedesversion", "" }, - { "nv!__gl_glsynctovblank", "" }, - { "nv!__gl_gvitimeoutcontrol", "" }, - { "nv!__gl_hcctrl", "" }, - { "nv!__gl_hwstate_per_ctx", "" }, - { "nv!__gl_machinecachelimit", "" }, - { "nv!__gl_maxframesallowed", "" }, - { "nv!__gl_memmgrcachedalloclimit", "" }, - { "nv!__gl_memmgrcachedalloclimitratio", "" }, - { "nv!__gl_memmgrsysheapalloclimit", "" }, - { "nv!__gl_memmgrsysheapalloclimitratio", "" }, - { "nv!__gl_memmgrvidheapalloclimit", "" }, - { "nv!__gl_mosaic_clip_to_subdev", "" }, - { "nv!__gl_mosaic_clip_to_subdev_h_overlap", "" }, - { "nv!__gl_mosaic_clip_to_subdev_v_overlap", "" }, - { "nv!__gl_overlaymergeblittimerms", "" }, - { "nv!__gl_perfmon_mode", "" }, - { "nv!__gl_pixbar_mode", "" }, - { "nv!__gl_qualityenhancements", "" }, - { "nv!__gl_r27s18q28", "" }, - { "nv!__gl_r2d7c1d8", "" }, - { "nv!__gl_renderer", "" }, - { "nv!__gl_renderqualityflags", "" }, - { "nv!__gl_s3tcquality", "" }, - { "nv!__gl_shaderatomics", "" }, - { "nv!__gl_shadercacheinitsize", "" }, - { "nv!__gl_shader_disk_cache_path", "" }, - { "nv!__gl_shader_disk_cache_read_only", "" }, - { "nv!__gl_shaderobjects", "" }, - { "nv!__gl_shaderportabilitywarnings", "" }, - { "nv!__gl_shaderwarningsaserrors", "" }, - { "nv!__gl_skiptexturehostcopies", "" }, - { "nv!__glslc_debug_level", "" }, - { "nv!__glslc_debug_mask", "" }, - { "nv!__glslc_debug_options", "" }, - { "nv!__glslc_debug_filename", "" }, - { "nv!__gl_sli_dli_control", "" }, - { "nv!__gl_sparsetexture", "" }, - { "nv!__gl_spinlooptimeout", "" }, - { "nv!__gl_sync_to_vblank", "" }, - { "nv!glsynctovblank", "" }, - { "nv!__gl_sysheapreuseratio", "" }, - { "nv!__gl_sysmemtexturepromotion", "" }, - { "nv!__gl_targetflushcount", "" }, - { "nv!__gl_tearingfreeswappresent", "" }, - { "nv!__gl_texclampbehavior", "" }, - { "nv!__gl_texlodbias", "" }, - { "nv!__gl_texmemoryspaceenables", "" }, - { "nv!__gl_textureprecache", "" }, - { "nv!__gl_threadcontrol", "" }, - { "nv!__gl_threadcontrol2", "" }, - { "nv!__gl_usegvievents", "" }, - { "nv!__gl_vbomemoryspaceenables", "" }, - { "nv!__gl_vertexlimit", "" }, - { "nv!__gl_vidheapreuseratio", "" }, - { "nv!__gl_vpipe", "" }, - { "nv!__gl_vpipeformatbloatlimit", "" }, - { "nv!__gl_wglmessageboxonabort", "" }, - { "nv!__gl_writeinfolog", "" }, - { "nv!__gl_writeprogramobjectassembly", "" }, - { "nv!__gl_writeprogramobjectsource", "" }, - { "nv!__gl_xnvadapterpresent", "" }, - { "nv!__gl_yield", "" }, - { "nv!__gl_yieldfunction", "" }, - { "nv!__gl_yieldfunctionfast", "" }, - { "nv!__gl_yieldfunctionslow", "" }, - { "nv!__gl_yieldfunctionwaitfordcqueue", "" }, - { "nv!__gl_yieldfunctionwaitforframe", "" }, - { "nv!__gl_yieldfunctionwaitforgpu", "" }, - { "nv!__gl_zbctableaddhysteresis", "" }, - { "nv!gpu_debug_mode", "" }, - { "nv!gpu_stay_on", "" }, - { "nv!gpu_timeout_ms_max", "" }, - { "nv!gvitimeoutcontrol", "" }, - { "nv!hcctrl", "" }, - { "nv!hwstate_per_ctx", "" }, - { "nv!libandroid_enable_log", "" }, - { "nv!machinecachelimit", "" }, - { "nv!maxframesallowed", "" }, - { "nv!media.aac_51_output_enabled", "" }, - { "nv!memmgrcachedalloclimit", "" }, - { "nv!memmgrcachedalloclimitratio", "" }, - { "nv!memmgrsysheapalloclimit", "" }, - { "nv!memmgrsysheapalloclimitratio", "" }, - { "nv!memmgrvidheapalloclimit", "" }, - { "nv!mosaic_clip_to_subdev", "" }, - { "nv!mosaic_clip_to_subdev_h_overlap", "" }, - { "nv!mosaic_clip_to_subdev_v_overlap", "" }, - { "nv!nvblit.dump", "" }, - { "nv!nvblit.profile", "" }, - { "nv!nvblit.twod", "" }, - { "nv!nvblit.vic", "" }, - { "nv!nvddk_vic_prevent_use", "" }, - { "nv!nv_decompression", "" }, - { "nv!nvdisp_bl_ctrl", "0" }, - { "nv!nvdisp_debug_mask", "" }, - { "nv!nvdisp_enable_ts", "0" }, - { "nv!nvhdcp_timeout_ms", "12000" }, - { "nv!nvhdcp_max_retries", "5" }, - { "nv!nv_emc_dvfs_test", "" }, - { "nv!nv_emc_init_rate_hz", "" }, - { "nv!nv_gmmu_va_page_split", "" }, - { "nv!nv_gmmu_va_range", "" }, - { "nv!nvhost_debug_mask", "" }, - { "nv!nvidia.hwc.dump_config", "" }, - { "nv!nvidia.hwc.dump_layerlist", "" }, - { "nv!nvidia.hwc.dump_windows", "" }, - { "nv!nvidia.hwc.enable_disp_trans", "" }, - { "nv!nvidia.hwc.ftrace_enable", "" }, - { "nv!nvidia.hwc.hdcp_enable", "" }, - { "nv!nvidia.hwc.hidden_window_mask0", "" }, - { "nv!nvidia.hwc.hidden_window_mask1", "" }, - { "nv!nvidia.hwc.immediate_modeset", "" }, - { "nv!nvidia.hwc.imp_enable", "" }, - { "nv!nvidia.hwc.no_egl", "" }, - { "nv!nvidia.hwc.no_scratchblit", "" }, - { "nv!nvidia.hwc.no_vic", "" }, - { "nv!nvidia.hwc.null_display", "" }, - { "nv!nvidia.hwc.scan_props", "" }, - { "nv!nvidia.hwc.swap_interval", "" }, - { "nv!nvidia.hwc.war_1515812", "0" }, - { "nv!nvmap_debug_mask", "" }, - { "nv!nv_memory_profiler", "" }, - { "nv!nvnflinger_enable_log", "" }, - { "nv!nvnflinger_flip_policy", "" }, - { "nv!nvnflinger_hotplug_autoswitch", "0" }, - { "nv!nvnflinger_prefer_primary_layer", "0" }, - { "nv!nvnflinger_service_priority", "" }, - { "nv!nvnflinger_service_threads", "" }, - { "nv!nvnflinger_swap_interval", "" }, - { "nv!nvnflinger_track_perf", "" }, - { "nv!nvnflinger_virtualdisplay_policy", "60hz" }, - { "nv!nvn_no_vsync_capability", false }, - { "nv!nvn_through_opengl", "" }, - { "nv!nv_pllcx_always_on", "" }, - { "nv!nv_pllcx_safe_div", "" }, - { "nv!nvrm_gpu_channel_interleave", "" }, - { "nv!nvrm_gpu_channel_priority", "" }, - { "nv!nvrm_gpu_channel_timeslice", "" }, - { "nv!nvrm_gpu_default_device_index", "" }, - { "nv!nvrm_gpu_dummy", "" }, - { "nv!nvrm_gpu_help", "" }, - { "nv!nvrm_gpu_nvgpu_disable", "" }, - { "nv!nvrm_gpu_nvgpu_do_nfa_partial_map", "" }, - { "nv!nvrm_gpu_nvgpu_ecc_overrides", "" }, - { "nv!nvrm_gpu_nvgpu_no_as_get_va_regions", "" }, - { "nv!nvrm_gpu_nvgpu_no_channel_abort", "" }, - { "nv!nvrm_gpu_nvgpu_no_cyclestats", "" }, - { "nv!nvrm_gpu_nvgpu_no_fixed", "" }, - { "nv!nvrm_gpu_nvgpu_no_gpu_characteristics", "" }, - { "nv!nvrm_gpu_nvgpu_no_ioctl_mutex", "" }, - { "nv!nvrm_gpu_nvgpu_no_map_buffer_ex", "" }, - { "nv!nvrm_gpu_nvgpu_no_robustness", "" }, - { "nv!nvrm_gpu_nvgpu_no_sparse", "" }, - { "nv!nvrm_gpu_nvgpu_no_syncpoints", "" }, - { "nv!nvrm_gpu_nvgpu_no_tsg", "" }, - { "nv!nvrm_gpu_nvgpu_no_zbc", "" }, - { "nv!nvrm_gpu_nvgpu_no_zcull", "" }, - { "nv!nvrm_gpu_nvgpu_wrap_channels_in_tsgs", "" }, - { "nv!nvrm_gpu_prevent_use", "" }, - { "nv!nvrm_gpu_trace", "" }, - { "nv!nvsched_debug_mask", "" }, - { "nv!nvsched_force_enable", "" }, - { "nv!nvsched_force_log", "" }, - { "nv!nv_usb_plls_hw_ctrl", "" }, - { "nv!nv_winsys", "" }, - { "nv!nvwsi_dump", "" }, - { "nv!nvwsi_fill", "" }, - { "nv!ogl_", "" }, - { "nv!ogl_0356afd0", "" }, - { "nv!ogl_0356afd1", "" }, - { "nv!ogl_0356afd2", "" }, - { "nv!ogl_0356afd3", "" }, - { "nv!ogl_0x923dc0", "" }, - { "nv!ogl_0x923dc1", "" }, - { "nv!ogl_0x923dc2", "" }, - { "nv!ogl_0x923dc3", "" }, - { "nv!ogl_0x923dc4", "" }, - { "nv!ogl_0x923dd3", "" }, - { "nv!ogl_0x9abdc5", "" }, - { "nv!ogl_0x9abdc6", "" }, - { "nv!ogl_0xbd10fb", "" }, - { "nv!ogl_0xce2348", "" }, - { "nv!ogl_10261989", "" }, - { "nv!ogl_1042d483", "" }, - { "nv!ogl_10572898", "" }, - { "nv!ogl_115631", "" }, - { "nv!ogl_12950094", "" }, - { "nv!ogl_1314f311", "" }, - { "nv!ogl_1314f312", "" }, - { "nv!ogl_13279512", "" }, - { "nv!ogl_13813496", "" }, - { "nv!ogl_14507179", "" }, - { "nv!ogl_15694569", "" }, - { "nv!ogl_16936964", "" }, - { "nv!ogl_17aa230c", "" }, - { "nv!ogl_182054", "" }, - { "nv!ogl_18273275", "" }, - { "nv!ogl_18273276", "" }, - { "nv!ogl_1854d03b", "" }, - { "nv!ogl_18add00d", "" }, - { "nv!ogl_19156670", "" }, - { "nv!ogl_19286545", "" }, - { "nv!ogl_1a298e9f", "" }, - { "nv!ogl_1acf43fe", "" }, - { "nv!ogl_1bda43fe", "" }, - { "nv!ogl_1c3b92", "" }, - { "nv!ogl_21509920", "" }, - { "nv!ogl_215323457", "" }, - { "nv!ogl_2165ad", "" }, - { "nv!ogl_2165ae", "" }, - { "nv!ogl_21be9c", "" }, - { "nv!ogl_233264316", "" }, - { "nv!ogl_234557580", "" }, - { "nv!ogl_23cd0e", "" }, - { "nv!ogl_24189123", "" }, - { "nv!ogl_2443266", "" }, - { "nv!ogl_25025519", "" }, - { "nv!ogl_255e39", "" }, - { "nv!ogl_2583364", "" }, - { "nv!ogl_2888c1", "" }, - { "nv!ogl_28ca3e", "" }, - { "nv!ogl_29871243", "" }, - { "nv!ogl_2a1f64", "" }, - { "nv!ogl_2dc432", "" }, - { "nv!ogl_2de437", "" }, - { "nv!ogl_2f3bb89c", "" }, - { "nv!ogl_2fd652", "" }, - { "nv!ogl_3001ac", "" }, - { "nv!ogl_31298772", "" }, - { "nv!ogl_313233", "" }, - { "nv!ogl_31f7d603", "" }, - { "nv!ogl_320ce4", "" }, - { "nv!ogl_32153248", "" }, - { "nv!ogl_32153249", "" }, - { "nv!ogl_335bca", "" }, - { "nv!ogl_342abb", "" }, - { "nv!ogl_34dfe6", "" }, - { "nv!ogl_34dfe7", "" }, - { "nv!ogl_34dfe8", "" }, - { "nv!ogl_34dfe9", "" }, - { "nv!ogl_35201578", "" }, - { "nv!ogl_359278", "" }, - { "nv!ogl_37f53a", "" }, - { "nv!ogl_38144972", "" }, - { "nv!ogl_38542646", "" }, - { "nv!ogl_3b74c9", "" }, - { "nv!ogl_3c136f", "" }, - { "nv!ogl_3cf72823", "" }, - { "nv!ogl_3d7af029", "" }, - { "nv!ogl_3ff34782", "" }, - { "nv!ogl_4129618", "" }, - { "nv!ogl_4189fac3", "" }, - { "nv!ogl_420bd4", "" }, - { "nv!ogl_42a699", "" }, - { "nv!ogl_441369", "" }, - { "nv!ogl_4458713e", "" }, - { "nv!ogl_4554b6", "" }, - { "nv!ogl_457425", "" }, - { "nv!ogl_4603b207", "" }, - { "nv!ogl_46574957", "" }, - { "nv!ogl_46574958", "" }, - { "nv!ogl_46813529", "" }, - { "nv!ogl_46f1e13d", "" }, - { "nv!ogl_47534c43", "" }, - { "nv!ogl_48550336", "" }, - { "nv!ogl_48576893", "" }, - { "nv!ogl_48576894", "" }, - { "nv!ogl_4889ac02", "" }, - { "nv!ogl_49005740", "" }, - { "nv!ogl_49867584", "" }, - { "nv!ogl_49960973", "" }, - { "nv!ogl_4a5341", "" }, - { "nv!ogl_4f4e48", "" }, - { "nv!ogl_4f8a0a", "" }, - { "nv!ogl_50299698", "" }, - { "nv!ogl_50299699", "" }, - { "nv!ogl_50361291", "" }, - { "nv!ogl_5242ae", "" }, - { "nv!ogl_53d30c", "" }, - { "nv!ogl_56347a", "" }, - { "nv!ogl_563a95f1", "" }, - { "nv!ogl_573823", "" }, - { "nv!ogl_58027529", "" }, - { "nv!ogl_5d2d63", "" }, - { "nv!ogl_5f7e3b", "" }, - { "nv!ogl_60461793", "" }, - { "nv!ogl_60d355", "" }, - { "nv!ogl_616627aa", "" }, - { "nv!ogl_62317182", "" }, - { "nv!ogl_6253fa2e", "" }, - { "nv!ogl_64100768", "" }, - { "nv!ogl_64100769", "" }, - { "nv!ogl_64100770", "" }, - { "nv!ogl_647395", "" }, - { "nv!ogl_66543234", "" }, - { "nv!ogl_67674763", "" }, - { "nv!ogl_67739784", "" }, - { "nv!ogl_68fb9c", "" }, - { "nv!ogl_69801276", "" }, - { "nv!ogl_6af9fa2f", "" }, - { "nv!ogl_6af9fa3f", "" }, - { "nv!ogl_6af9fa4f", "" }, - { "nv!ogl_6bd8c7", "" }, - { "nv!ogl_6c7691", "" }, - { "nv!ogl_6d4296ce", "" }, - { "nv!ogl_6dd7e7", "" }, - { "nv!ogl_6dd7e8", "" }, - { "nv!ogl_6fe11ec1", "" }, - { "nv!ogl_716511763", "" }, - { "nv!ogl_72504593", "" }, - { "nv!ogl_73304097", "" }, - { "nv!ogl_73314098", "" }, - { "nv!ogl_74095213", "" }, - { "nv!ogl_74095213a", "" }, - { "nv!ogl_74095213b", "" }, - { "nv!ogl_74095214", "" }, - { "nv!ogl_748f9649", "" }, - { "nv!ogl_75494732", "" }, - { "nv!ogl_78452832", "" }, - { "nv!ogl_784561", "" }, - { "nv!ogl_78e16b9c", "" }, - { "nv!ogl_79251225", "" }, - { "nv!ogl_7c128b", "" }, - { "nv!ogl_7ccd93", "" }, - { "nv!ogl_7df8d1", "" }, - { "nv!ogl_800c2310", "" }, - { "nv!ogl_80546710", "" }, - { "nv!ogl_80772310", "" }, - { "nv!ogl_808ee280", "" }, - { "nv!ogl_81131154", "" }, - { "nv!ogl_81274457", "" }, - { "nv!ogl_8292291f", "" }, - { "nv!ogl_83498426", "" }, - { "nv!ogl_84993794", "" }, - { "nv!ogl_84995585", "" }, - { "nv!ogl_84a0a0", "" }, - { "nv!ogl_852142", "" }, - { "nv!ogl_85612309", "" }, - { "nv!ogl_85612310", "" }, - { "nv!ogl_85612311", "" }, - { "nv!ogl_85612312", "" }, - { "nv!ogl_8623ff27", "" }, - { "nv!ogl_87364952", "" }, - { "nv!ogl_87f6275666", "" }, - { "nv!ogl_886748", "" }, - { "nv!ogl_89894423", "" }, - { "nv!ogl_8ad8a75", "" }, - { "nv!ogl_8ad8ad00", "" }, - { "nv!ogl_8bb815", "" }, - { "nv!ogl_8bb817", "" }, - { "nv!ogl_8bb818", "" }, - { "nv!ogl_8bb819", "" }, - { "nv!ogl_8e640cd1", "" }, - { "nv!ogl_8f34971a", "" }, - { "nv!ogl_8f773984", "" }, - { "nv!ogl_8f7a7d", "" }, - { "nv!ogl_902486209", "" }, - { "nv!ogl_90482571", "" }, - { "nv!ogl_91214835", "" }, - { "nv!ogl_912848290", "" }, - { "nv!ogl_915e56", "" }, - { "nv!ogl_92179063", "" }, - { "nv!ogl_92179064", "" }, - { "nv!ogl_92179065", "" }, - { "nv!ogl_92179066", "" }, - { "nv!ogl_92350358", "" }, - { "nv!ogl_92809063", "" }, - { "nv!ogl_92809064", "" }, - { "nv!ogl_92809065", "" }, - { "nv!ogl_92809066", "" }, - { "nv!ogl_92920143", "" }, - { "nv!ogl_93a89b12", "" }, - { "nv!ogl_93a89c0b", "" }, - { "nv!ogl_94812574", "" }, - { "nv!ogl_95282304", "" }, - { "nv!ogl_95394027", "" }, - { "nv!ogl_959b1f", "" }, - { "nv!ogl_9638af", "" }, - { "nv!ogl_96fd59", "" }, - { "nv!ogl_97f6275666", "" }, - { "nv!ogl_97f6275667", "" }, - { "nv!ogl_97f6275668", "" }, - { "nv!ogl_97f6275669", "" }, - { "nv!ogl_97f627566a", "" }, - { "nv!ogl_97f627566b", "" }, - { "nv!ogl_97f627566d", "" }, - { "nv!ogl_97f627566e", "" }, - { "nv!ogl_97f627566f", "" }, - { "nv!ogl_97f6275670", "" }, - { "nv!ogl_97f6275671", "" }, - { "nv!ogl_97f727566e", "" }, - { "nv!ogl_98480775", "" }, - { "nv!ogl_98480776", "" }, - { "nv!ogl_98480777", "" }, - { "nv!ogl_992431", "" }, - { "nv!ogl_9aa29065", "" }, - { "nv!ogl_9af32c", "" }, - { "nv!ogl_9af32d", "" }, - { "nv!ogl_9af32e", "" }, - { "nv!ogl_9c108b71", "" }, - { "nv!ogl_9f279065", "" }, - { "nv!ogl_a01bc728", "" }, - { "nv!ogl_a13b46c80", "" }, - { "nv!ogl_a22eb0", "" }, - { "nv!ogl_a2fb451e", "" }, - { "nv!ogl_a3456abe", "" }, - { "nv!ogl_a7044887", "" }, - { "nv!ogl_a7149200", "" }, - { "nv!ogl_a766215670", "" }, - { "nv!ogl_aalinegamma", "" }, - { "nv!ogl_aalinetweaks", "" }, - { "nv!ogl_ab34ee01", "" }, - { "nv!ogl_ab34ee02", "" }, - { "nv!ogl_ab34ee03", "" }, - { "nv!ogl_ac0274", "" }, - { "nv!ogl_af73c63e", "" }, - { "nv!ogl_af73c63f", "" }, - { "nv!ogl_af9927", "" }, - { "nv!ogl_afoverride", "" }, - { "nv!ogl_allocdeviceevents", "" }, - { "nv!ogl_applicationkey", "" }, - { "nv!ogl_appreturnonlybasicglsltype", "" }, - { "nv!ogl_app_softimage", "" }, - { "nv!ogl_app_supportbits2", "" }, - { "nv!ogl_assumetextureismipmappedatcreation", "" }, - { "nv!ogl_b1fb0f01", "" }, - { "nv!ogl_b3edd5", "" }, - { "nv!ogl_b40d9e03d", "" }, - { "nv!ogl_b7f6275666", "" }, - { "nv!ogl_b812c1", "" }, - { "nv!ogl_ba14ba1a", "" }, - { "nv!ogl_ba14ba1b", "" }, - { "nv!ogl_bd7559", "" }, - { "nv!ogl_bd755a", "" }, - { "nv!ogl_bd755c", "" }, - { "nv!ogl_bd755d", "" }, - { "nv!ogl_be58bb", "" }, - { "nv!ogl_be92cb", "" }, - { "nv!ogl_beefcba3", "" }, - { "nv!ogl_beefcba4", "" }, - { "nv!ogl_c023777f", "" }, - { "nv!ogl_c09dc8", "" }, - { "nv!ogl_c0d340", "" }, - { "nv!ogl_c2ff374c", "" }, - { "nv!ogl_c5e9d7a3", "" }, - { "nv!ogl_c5e9d7a4", "" }, - { "nv!ogl_c5e9d7b4", "" }, - { "nv!ogl_c618f9", "" }, - { "nv!ogl_ca345840", "" }, - { "nv!ogl_cachedisable", "" }, - { "nv!ogl_channelpriorityoverride", "" }, - { "nv!ogl_cleardatastorevidmem", "" }, - { "nv!ogl_cmdbufmemoryspaceenables", "" }, - { "nv!ogl_cmdbufminwords", "" }, - { "nv!ogl_cmdbufsizewords", "" }, - { "nv!ogl_conformantblitframebufferscissor", "" }, - { "nv!ogl_conformantincompletetextures", "" }, - { "nv!ogl_copybuffermethod", "" }, - { "nv!ogl_cubemapaniso", "" }, - { "nv!ogl_cubemapfiltering", "" }, - { "nv!ogl_d0e9a4d7", "" }, - { "nv!ogl_d13733f12", "" }, - { "nv!ogl_d1b399", "" }, - { "nv!ogl_d2983c32", "" }, - { "nv!ogl_d2983c33", "" }, - { "nv!ogl_d2e71b", "" }, - { "nv!ogl_d377dc", "" }, - { "nv!ogl_d377dd", "" }, - { "nv!ogl_d489f4", "" }, - { "nv!ogl_d4bce1", "" }, - { "nv!ogl_d518cb", "" }, - { "nv!ogl_d518cd", "" }, - { "nv!ogl_d518ce", "" }, - { "nv!ogl_d518d0", "" }, - { "nv!ogl_d518d1", "" }, - { "nv!ogl_d518d2", "" }, - { "nv!ogl_d518d3", "" }, - { "nv!ogl_d518d4", "" }, - { "nv!ogl_d518d5", "" }, - { "nv!ogl_d59eda", "" }, - { "nv!ogl_d83cbd", "" }, - { "nv!ogl_d8e777", "" }, - { "nv!ogl_debug_level", "" }, - { "nv!ogl_debug_mask", "" }, - { "nv!ogl_debug_options", "" }, - { "nv!ogl_devshmpageableallocations", "" }, - { "nv!ogl_df1f9812", "" }, - { "nv!ogl_df783c", "" }, - { "nv!ogl_diagenable", "" }, - { "nv!ogl_disallowcemask", "" }, - { "nv!ogl_disallowz16", "" }, - { "nv!ogl_dlmemoryspaceenables", "" }, - { "nv!ogl_e0bfec", "" }, - { "nv!ogl_e433456d", "" }, - { "nv!ogl_e435563f", "" }, - { "nv!ogl_e4cd9c", "" }, - { "nv!ogl_e5c972", "" }, - { "nv!ogl_e639ef", "" }, - { "nv!ogl_e802af", "" }, - { "nv!ogl_eae964", "" }, - { "nv!ogl_earlytexturehwallocation", "" }, - { "nv!ogl_eb92a3", "" }, - { "nv!ogl_ebca56", "" }, - { "nv!ogl_expert_detail_level", "" }, - { "nv!ogl_expert_output_mask", "" }, - { "nv!ogl_expert_report_mask", "" }, - { "nv!ogl_extensionstringnvarch", "" }, - { "nv!ogl_extensionstringversion", "" }, - { "nv!ogl_f00f1938", "" }, - { "nv!ogl_f10736", "" }, - { "nv!ogl_f1846870", "" }, - { "nv!ogl_f33bc370", "" }, - { "nv!ogl_f392a874", "" }, - { "nv!ogl_f49ae8", "" }, - { "nv!ogl_fa345cce", "" }, - { "nv!ogl_fa35cc4", "" }, - { "nv!ogl_faa14a", "" }, - { "nv!ogl_faf8a723", "" }, - { "nv!ogl_fastgs", "" }, - { "nv!ogl_fbf4ac45", "" }, - { "nv!ogl_fbo_blit_ignore_srgb", "" }, - { "nv!ogl_fc64c7", "" }, - { "nv!ogl_ff54ec97", "" }, - { "nv!ogl_ff54ec98", "" }, - { "nv!ogl_forceexitprocessdetach", "" }, - { "nv!ogl_forcerequestedesversion", "" }, - { "nv!ogl_glsynctovblank", "" }, - { "nv!ogl_gvitimeoutcontrol", "" }, - { "nv!ogl_hcctrl", "" }, - { "nv!ogl_hwstate_per_ctx", "" }, - { "nv!ogl_machinecachelimit", "" }, - { "nv!ogl_maxframesallowed", "" }, - { "nv!ogl_memmgrcachedalloclimit", "" }, - { "nv!ogl_memmgrcachedalloclimitratio", "" }, - { "nv!ogl_memmgrsysheapalloclimit", "" }, - { "nv!ogl_memmgrsysheapalloclimitratio", "" }, - { "nv!ogl_memmgrvidheapalloclimit", "" }, - { "nv!ogl_mosaic_clip_to_subdev", "" }, - { "nv!ogl_mosaic_clip_to_subdev_h_overlap", "" }, - { "nv!ogl_mosaic_clip_to_subdev_v_overlap", "" }, - { "nv!ogl_overlaymergeblittimerms", "" }, - { "nv!ogl_perfmon_mode", "" }, - { "nv!ogl_pixbar_mode", "" }, - { "nv!ogl_qualityenhancements", "" }, - { "nv!ogl_r27s18q28", "" }, - { "nv!ogl_r2d7c1d8", "" }, - { "nv!ogl_renderer", "" }, - { "nv!ogl_renderqualityflags", "" }, - { "nv!ogl_s3tcquality", "" }, - { "nv!ogl_shaderatomics", "" }, - { "nv!ogl_shadercacheinitsize", "" }, - { "nv!ogl_shader_disk_cache_path", "" }, - { "nv!ogl_shader_disk_cache_read_only", "" }, - { "nv!ogl_shaderobjects", "" }, - { "nv!ogl_shaderportabilitywarnings", "" }, - { "nv!ogl_shaderwarningsaserrors", "" }, - { "nv!ogl_skiptexturehostcopies", "" }, - { "nv!ogl_sli_dli_control", "" }, - { "nv!ogl_sparsetexture", "" }, - { "nv!ogl_spinlooptimeout", "" }, - { "nv!ogl_sync_to_vblank", "" }, - { "nv!ogl_sysheapreuseratio", "" }, - { "nv!ogl_sysmemtexturepromotion", "" }, - { "nv!ogl_targetflushcount", "" }, - { "nv!ogl_tearingfreeswappresent", "" }, - { "nv!ogl_texclampbehavior", "" }, - { "nv!ogl_texlodbias", "" }, - { "nv!ogl_texmemoryspaceenables", "" }, - { "nv!ogl_textureprecache", "" }, - { "nv!ogl_threadcontrol", "" }, - { "nv!ogl_threadcontrol2", "" }, - { "nv!ogl_usegvievents", "" }, - { "nv!ogl_vbomemoryspaceenables", "" }, - { "nv!ogl_vertexlimit", "" }, - { "nv!ogl_vidheapreuseratio", "" }, - { "nv!ogl_vpipe", "" }, - { "nv!ogl_vpipeformatbloatlimit", "" }, - { "nv!ogl_wglmessageboxonabort", "" }, - { "nv!ogl_writeinfolog", "" }, - { "nv!ogl_writeprogramobjectassembly", "" }, - { "nv!ogl_writeprogramobjectsource", "" }, - { "nv!ogl_xnvadapterpresent", "" }, - { "nv!ogl_yield", "" }, - { "nv!ogl_yieldfunction", "" }, - { "nv!ogl_yieldfunctionfast", "" }, - { "nv!ogl_yieldfunctionslow", "" }, - { "nv!ogl_yieldfunctionwaitfordcqueue", "" }, - { "nv!ogl_yieldfunctionwaitforframe", "" }, - { "nv!ogl_yieldfunctionwaitforgpu", "" }, - { "nv!ogl_zbctableaddhysteresis", "" }, - { "nv!overlaymergeblittimerms", "" }, - { "nv!perfmon_mode", "" }, - { "nv!persist.sys.display.resolution", "" }, - { "nv!persist.tegra.composite.fallb", "" }, - { "nv!persist.tegra.composite.policy", "" }, - { "nv!persist.tegra.composite.range", "" }, - { "nv!persist.tegra.compositor", "" }, - { "nv!persist.tegra.compositor.virt", "" }, - { "nv!persist.tegra.compression", "" }, - { "nv!persist.tegra.cursor.enable", "" }, - { "nv!persist.tegra.didim.enable", "" }, - { "nv!persist.tegra.didim.normal", "" }, - { "nv!persist.tegra.didim.video", "" }, - { "nv!persist.tegra.disp.heads", "" }, - { "nv!persist.tegra.gamma_correction", "" }, - { "nv!persist.tegra.gpu_mapping_cache", "" }, - { "nv!persist.tegra.grlayout", "" }, - { "nv!persist.tegra.hdmi.2020.10", "" }, - { "nv!persist.tegra.hdmi.2020.fake", "" }, - { "nv!persist.tegra.hdmi.2020.force", "" }, - { "nv!persist.tegra.hdmi.autorotate", "" }, - { "nv!persist.tegra.hdmi.hdr.fake", "" }, - { "nv!persist.tegra.hdmi.ignore_ratio", "" }, - { "nv!persist.tegra.hdmi.limit.clock", "" }, - { "nv!persist.tegra.hdmi.only_16_9", "" }, - { "nv!persist.tegra.hdmi.range", "" }, - { "nv!persist.tegra.hdmi.resolution", "" }, - { "nv!persist.tegra.hdmi.underscan", "" }, - { "nv!persist.tegra.hdmi.yuv.422", "" }, - { "nv!persist.tegra.hdmi.yuv.444", "" }, - { "nv!persist.tegra.hdmi.yuv.enable", "" }, - { "nv!persist.tegra.hdmi.yuv.force", "" }, - { "nv!persist.tegra.hwc.nvdc", "" }, - { "nv!persist.tegra.idle.minimum_fps", "" }, - { "nv!persist.tegra.panel.rotation", "" }, - { "nv!persist.tegra.scan_props", "" }, - { "nv!persist.tegra.stb.mode", "" }, - { "nv!persist.tegra.zbc_override", "" }, - { "nv!pixbar_mode", "" }, - { "nv!qualityenhancements", "" }, - { "nv!r27s18q28", "" }, - { "nv!r2d7c1d8", "" }, - { "nv!renderer", "" }, - { "nv!renderqualityflags", "" }, - { "nv!rmos_debug_mask", "" }, - { "nv!rmos_set_production_mode", "" }, - { "nv!s3tcquality", "" }, - { "nv!shaderatomics", "" }, - { "nv!shadercacheinitsize", "" }, - { "nv!shader_disk_cache_path", "" }, - { "nv!shader_disk_cache_read_only", "" }, - { "nv!shaderobjects", "" }, - { "nv!shaderportabilitywarnings", "" }, - { "nv!shaderwarningsaserrors", "" }, - { "nv!skiptexturehostcopies", "" }, - { "nv!sli_dli_control", "" }, - { "nv!sparsetexture", "" }, - { "nv!spinlooptimeout", "" }, - { "nv!sync_to_vblank", "" }, - { "nv!sysheapreuseratio", "" }, - { "nv!sysmemtexturepromotion", "" }, - { "nv!targetflushcount", "" }, - { "nv!tearingfreeswappresent", "" }, - { "nv!tegra.refresh", "" }, - { "nv!texclampbehavior", "" }, - { "nv!texlodbias", "" }, - { "nv!texmemoryspaceenables", "" }, - { "nv!textureprecache", "" }, - { "nv!threadcontrol", "" }, - { "nv!threadcontrol2", "" }, - { "nv!tvmr.avp.logs", "" }, - { "nv!tvmr.buffer.logs", "" }, - { "nv!tvmr.dec.prof", "" }, - { "nv!tvmr.deint.logs", "" }, - { "nv!tvmr.dfs.logs", "" }, - { "nv!tvmr.ffprof.logs", "" }, - { "nv!tvmr.game.stream", "" }, - { "nv!tvmr.general.logs", "" }, - { "nv!tvmr.input.dump", "" }, - { "nv!tvmr.seeking.logs", "" }, - { "nv!tvmr.ts_pulldown", "" }, - { "nv!usegvievents", "" }, - { "nv!vbomemoryspaceenables", "" }, - { "nv!vcc_debug_ip", "" }, - { "nv!vcc_verbose_level", "" }, - { "nv!vertexlimit", "" }, - { "nv!viccomposer.filter", "" }, - { "nv!videostats-enable", "" }, - { "nv!vidheapreuseratio", "" }, - { "nv!vpipe", "" }, - { "nv!vpipeformatbloatlimit", "" }, - { "nv!wglmessageboxonabort", "" }, - { "nv!writeinfolog", "" }, - { "nv!writeprogramobjectassembly", "" }, - { "nv!writeprogramobjectsource", "" }, - { "nv!xnvadapterpresent", "" }, - { "nv!yield", "" }, - { "nv!yieldfunction", "" }, - { "nv!yieldfunctionfast", "" }, - { "nv!yieldfunctionslow", "" }, - { "nv!yieldfunctionwaitfordcqueue", "" }, - { "nv!yieldfunctionwaitforframe", "" }, - { "nv!yieldfunctionwaitforgpu", "" }, - { "nv!zbctableaddhysteresis", "" }, - { "pcm!enable", true }, - { "pctl!intermittent_task_interval_seconds", 21600 }, - { "prepo!devmenu_prepo_page_view", false }, - { "prepo!background_processing", true }, - { "prepo!transmission_interval_min", 10 }, - { "prepo!transmission_retry_interval", 3600 }, - { "psm!evaluation_log_enabled", false }, - { "snap_shot_dump!auto_dump", false }, - { "snap_shot_dump!output_dir", "%USERPROFILE%/Documents/Nintendo/NXDMP" }, - { "snap_shot_dump!full_dump", false }, - { "systemconfig!field_testing", false }, - { "systemconfig!exhivision", false }, - { "systempowerstate!always_reboot", false }, - { "systempowerstate!power_state_message_emulation_trigger_time", 0 }, - { "systempowerstate!power_state_message_to_emulate", 0 }, - { "target_manager!device_name", "" }, - { "vulnerability!needs_update_vulnerability_policy", 0 }, - { "apm!performance_mode_policy", "auto" }, - { "apm!sdev_throttling_enabled", true }, - { "apm!sdev_throttling_additional_delay_us", 16000 }, - { "apm!battery_draining_enabled", false }, - { "apm!sdev_cpu_overclock_enabled", false }, - { "bcat!production_mode", true }, - { "bpc!enable_quasi_off", true }, - { "bsp0!usb", "UDS" }, - { "bsp0!tm_transport", "USB" }, - { "bluetooth_debug!skip_boot", false }, - { "contents_delivery!enable_debug_api", false }, - { "eupld!upload_enabled", true }, - { "fatal!transition_to_fatal", true }, - { "fatal!show_extra_info", false }, - { "gpu_core_dump!auto_dump", false }, - { "hid_debug!enables_debugpad", false }, - { "hid_debug!manages_devices", true }, - { "hid_debug!emulate_future_device", false }, - { "hid_debug!emulate_firmware_update_failure", false }, - { "hid_debug!emulate_mcu_hardware_error", false }, - { "hid_debug!firmware_update_failure_emulation_mode", 0 }, - { "jit_debug!enable_jit_debug", false }, - { "npns!background_processing", true }, - { "npns!logmanager_redirection", true }, - { "npns!sleep_processing_timeout", 30 }, - { "npns!sleep_periodic_interval", 10800 }, - { "npns!sleep_max_try_count", 5 }, - { "npns!test_mode", false }, - { "ns.applet!overlay_applet_id", "0x010000000000100c" }, - { "ns.applet!system_applet_id", "0x0100000000001000" }, - { "ns.applet!shop_applet_id", "0x010000000000100b" }, - { "ns.autoboot!enabled", true }, - { "ns.pseudodeviceid!reset_pseudo_device_id", false }, - { "nsd!environment_identifier", "lp1" }, - { "nsd!test_mode", false }, - { "ntc!is_autonomic_correction_enabled", true }, - { "ntc!autonomic_correction_interval_seconds", 432000 }, - { "ntc!autonomic_correction_failed_retry_interval_seconds", 1800 }, - { "ntc!autonomic_correction_immediate_try_count_max", 4 }, - { "ntc!autonomic_correction_immediate_try_interval_milliseconds", 5000 }, - { "nv!nv_graphics_firmware_memory_margin", false }, - { "omm!operation_mode_policy", "auto" }, - { "omm!sleep_fade_in_ms", 50 }, - { "omm!sleep_fade_out_ms", 100 }, - { "omm!charging_sign_ms", 3000 }, - { "omm!low_battery_sign_ms", 3000 }, - { "omm!sign_fade_in_ms", 0 }, - { "omm!sign_fade_out_ms", 400 }, - { "omm!sign_wait_layer_visible_ms", 100 }, - { "omm!startup_fade_in_ms", 200 }, - { "omm!startup_fade_out_ms", 400 }, - { "omm!backlight_off_ms_on_handheld_switch", 150 }, - { "omm!sleep_on_ac_ok_boot", true }, - { "pdm!save_playlog", true }, - { "productinfo!product_name", "Nintendo Switch" }, - { "productinfo!cec_osd_name", "NintendoSwitch" }, - { "ro!ease_nro_restriction", false }, - { "settings_debug!is_debug_mode_enabled", false }, - { "systemreport!enabled", true }, - { "systemsleep!enter_sleep", true }, - { "systemsleep!enter_sc7", true }, - { "systemsleep!keep_vdd_core", true }, - { "systemsleep!disable_tma_sleep", false }, - { "systemsleep!disable_auto_sleep", false }, - { "systemsleep!override_auto_sleep_time", 0 }, - { "systemsleep!sleep_pending_time_ms", 15000 }, - { "systemsleep!hush_time_after_brief_power_button_press_ms", 1000 }, - { "systemsleep!transition_timeout_sec", 60 }, - { "systemsleep!dummy_event_auto_wake", false }, - { "systemupdate!debug_id", "0x0000000000000000" }, - { "systemupdate!debug_version", 0 }, - { "systemupdate!bgnup_retry_seconds", 60 }, - { "systemupdate!enable_background_download_stress_testing", false }, - { "systemupdate!debug_id_for_content_delivery", "0x0000000000000000" }, - { "systemupdate!debug_version_for_content_delivery", 0 }, - { "systemupdate!assumed_system_applet_version", 0 }, - { "tc!iir_filter_gain_soc", 100 }, - { "tc!iir_filter_gain_pcb", 100 }, - { "tc!tskin_soc_coefficients_handheld", "[5464, 174190]" }, - { "tc!tskin_soc_coefficients_console", "[6182, 112480]" }, - { "tc!tskin_pcb_coefficients_handheld", "[5464, 174190]" }, - { "tc!tskin_pcb_coefficients_console", "[6182, 112480]" }, - { "tc!tskin_select", "both" }, - { "tc!tskin_rate_table_handheld", "[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 102], [48000, 53000, 102, 153], [53000, 1000000, 153, 153], [48000, 1000000, 153, 153]]" }, - { "tc!tskin_rate_table_console", "[[-1000000, 43000, 51, 51], [43000, 53000, 51, 153], [53000, 58000, 153, 255], [58000, 1000000, 255, 255]]" }, - { "tc!rate_select", "both" }, - { "tc!log_enabled", false }, - { "tc!sleep_enabled", true }, - { "time!standard_steady_clock_test_offset_minutes", 0 }, - { "time!standard_steady_clock_rtc_update_interval_minutes", 5 }, - { "time!standard_network_clock_sufficient_accuracy_minutes", 43200 }, - { "usb!usb30_force_enabled", false }, - { "wlan_debug!skip_wlan_boot", false }, - }; - } -} +using System.Collections.Generic; + +namespace Ryujinx.HLE.OsHle.Services.Set +{ + static class NxSettings + { + //Generated automatically from a Switch 3.0 config file (Tid: 0100000000000818). + public static Dictionary Settings = new Dictionary() + { + { "account!na_required_for_network_service", true }, + { "account.daemon!background_awaking_periodicity", 10800 }, + { "account.daemon!schedule_periodicity", 3600 }, + { "account.daemon!profile_sync_interval", 18000 }, + { "account.daemon!na_info_refresh_interval", 46800 }, + { "am.display!transition_layer_enabled", true }, + { "am.gpu!gpu_scheduling_enabled", true }, + { "am.gpu!gpu_scheduling_frame_time_us", 116666 }, + { "am.gpu!gpu_scheduling_fg_app_us", 116166 }, + { "am.gpu!gpu_scheduling_bg_app_us", 104500 }, + { "am.gpu!gpu_scheduling_oa_us", 500 }, + { "am.gpu!gpu_scheduling_fg_sa_us", 11666 }, + { "am.gpu!gpu_scheduling_bg_sa_us", 0 }, + { "am.gpu!gpu_scheduling_fg_la_us", 11666 }, + { "am.gpu!gpu_scheduling_partial_fg_la_us", 2000 }, + { "am.gpu!gpu_scheduling_bg_la_us", 0 }, + { "audio!audren_log_enabled", false }, + { "audio!audout_log_enabled", false }, + { "audio!audin_log_enabled", false }, + { "audio!hwopus_log_enabled", false }, + { "audio!adsp_log_enabled", false }, + { "audio!suspend_for_debugger_enabled", false }, + { "audio!uac_speaker_enabled", false }, + { "bgtc!enable_halfawake", 1 }, + { "bgtc!enable_battery_saver", 1 }, + { "bgtc!leaving_halfawake_margin", 3 }, + { "bgtc!battery_threshold_save", 20 }, + { "bgtc!battery_threshold_stop", 20 }, + { "bgtc!minimum_interval_normal", 1800 }, + { "bgtc!minimum_interval_save", 86400 }, + { "boot!force_maintenance", false }, + { "capsrv!screenshot_layerstack", "screenshot" }, + { "capsrv!enable_album_screenshot_filedata_verification", true }, + { "devmenu!enable_application_update", true }, + { "devmenu!enable_exhibition_mode", false }, + { "eclct!analytics_override", false }, + { "eclct!analytics_pollperiod", 86400 }, + { "err!applet_auto_close", false }, + { "friends!background_processing", true }, + { "htc!disconnection_emulation", false }, + { "idle!dim_level_percent_lcd", 10 }, + { "idle!dim_level_percent_tv", 70 }, + { "lbl!force_disable_als", false }, + { "lm!enable_sd_card_logging", false }, + { "lm!sd_card_log_output_directory", "NxBinLogs" }, + { "mii!is_db_test_mode_enabled", false }, + { "news!system_version", 2 }, + { "nfp!not_locked_tag", true }, + { "nfp!play_report", false }, + { "nifm!is_communication_control_enabled_for_test", false }, + { "nifm!connection_test_timeout", 45000 }, + { "nifm!apply_config_timeout", 30000 }, + { "nifm!ethernet_adapter_standby_time", 10000 }, + { "nim.install!prefer_delta_evenif_inefficient", false }, + { "nim.install!apply_delta_stress_storage", 0 }, + { "ns.notification!retry_interval", 60 }, + { "ns.notification!enable_network_update", true }, + { "ns.notification!enable_download_task_list", true }, + { "ns.notification!enable_version_list", true }, + { "ns.notification!enable_random_wait", true }, + { "ns.notification!debug_waiting_limit", 0 }, + { "ns.notification!enable_request_on_cold_boot", true }, + { "ns.sdcard!mount_sdcard", true }, + { "ns.sdcard!compare_sdcard", 0 }, + { "ns.gamecard!mount_gamecard_result_value", 0 }, + { "ns.gamecard!try_gamecard_access_result_value", 0 }, + { "nv!00008600", "" }, + { "nv!0007b25e", "" }, + { "nv!0083e1", "" }, + { "nv!01621887", "" }, + { "nv!03134743", "" }, + { "nv!0356afd0", "" }, + { "nv!0356afd1", "" }, + { "nv!0356afd2", "" }, + { "nv!0356afd3", "" }, + { "nv!094313", "" }, + { "nv!0x04dc09", "" }, + { "nv!0x111133", "" }, + { "nv!0x1aa483", "" }, + { "nv!0x1cb1cf", "" }, + { "nv!0x1cb1d0", "" }, + { "nv!0x1e3221", "" }, + { "nv!0x300fc8", "" }, + { "nv!0x301fc8", "" }, + { "nv!0x302fc8", "" }, + { "nv!0x3eec59", "" }, + { "nv!0x46b3ed", "" }, + { "nv!0x523dc0", "" }, + { "nv!0x523dc1", "" }, + { "nv!0x523dc2", "" }, + { "nv!0x523dc3", "" }, + { "nv!0x523dc4", "" }, + { "nv!0x523dc5", "" }, + { "nv!0x523dc6", "" }, + { "nv!0x523dd0", "" }, + { "nv!0x523dd1", "" }, + { "nv!0x523dd3", "" }, + { "nv!0x5344bb", "" }, + { "nv!0x555237", "" }, + { "nv!0x58a234", "" }, + { "nv!0x7b4428", "" }, + { "nv!0x923dc0", "" }, + { "nv!0x923dc1", "" }, + { "nv!0x923dc2", "" }, + { "nv!0x923dc3", "" }, + { "nv!0x923dc4", "" }, + { "nv!0x923dd3", "" }, + { "nv!0x9abdc5", "" }, + { "nv!0x9abdc6", "" }, + { "nv!0xaaa36c", "" }, + { "nv!0xb09da0", "" }, + { "nv!0xb09da1", "" }, + { "nv!0xb09da2", "" }, + { "nv!0xb09da3", "" }, + { "nv!0xb09da4", "" }, + { "nv!0xb09da5", "" }, + { "nv!0xb0b348", "" }, + { "nv!0xb0b349", "" }, + { "nv!0xbb558f", "" }, + { "nv!0xbd10fb", "" }, + { "nv!0xc32ad3", "" }, + { "nv!0xce2348", "" }, + { "nv!0xcfd81f", "" }, + { "nv!0xe0036b", "" }, + { "nv!0xe01f2d", "" }, + { "nv!0xe17212", "" }, + { "nv!0xeae966", "" }, + { "nv!0xed4f82", "" }, + { "nv!0xf12335", "" }, + { "nv!0xf12336", "" }, + { "nv!10261989", "" }, + { "nv!1042d483", "" }, + { "nv!10572898", "" }, + { "nv!115631", "" }, + { "nv!12950094", "" }, + { "nv!1314f311", "" }, + { "nv!1314f312", "" }, + { "nv!13279512", "" }, + { "nv!13813496", "" }, + { "nv!14507179", "" }, + { "nv!15694569", "" }, + { "nv!16936964", "" }, + { "nv!17aa230c", "" }, + { "nv!182054", "" }, + { "nv!18273275", "" }, + { "nv!18273276", "" }, + { "nv!1854d03b", "" }, + { "nv!18add00d", "" }, + { "nv!19156670", "" }, + { "nv!19286545", "" }, + { "nv!1a298e9f", "" }, + { "nv!1acf43fe", "" }, + { "nv!1bda43fe", "" }, + { "nv!1c3b92", "" }, + { "nv!21509920", "" }, + { "nv!215323457", "" }, + { "nv!2165ad", "" }, + { "nv!2165ae", "" }, + { "nv!21be9c", "" }, + { "nv!233264316", "" }, + { "nv!234557580", "" }, + { "nv!23cd0e", "" }, + { "nv!24189123", "" }, + { "nv!2443266", "" }, + { "nv!25025519", "" }, + { "nv!255e39", "" }, + { "nv!2583364", "" }, + { "nv!2888c1", "" }, + { "nv!28ca3e", "" }, + { "nv!29871243", "" }, + { "nv!2a1f64", "" }, + { "nv!2dc432", "" }, + { "nv!2de437", "" }, + { "nv!2f3bb89c", "" }, + { "nv!2fd652", "" }, + { "nv!3001ac", "" }, + { "nv!31298772", "" }, + { "nv!313233", "" }, + { "nv!31f7d603", "" }, + { "nv!320ce4", "" }, + { "nv!32153248", "" }, + { "nv!32153249", "" }, + { "nv!335bca", "" }, + { "nv!342abb", "" }, + { "nv!34dfe6", "" }, + { "nv!34dfe7", "" }, + { "nv!34dfe8", "" }, + { "nv!34dfe9", "" }, + { "nv!35201578", "" }, + { "nv!359278", "" }, + { "nv!37f53a", "" }, + { "nv!38144972", "" }, + { "nv!38542646", "" }, + { "nv!3b74c9", "" }, + { "nv!3c136f", "" }, + { "nv!3cf72823", "" }, + { "nv!3d7af029", "" }, + { "nv!3ff34782", "" }, + { "nv!4129618", "" }, + { "nv!4189fac3", "" }, + { "nv!420bd4", "" }, + { "nv!42a699", "" }, + { "nv!441369", "" }, + { "nv!4458713e", "" }, + { "nv!4554b6", "" }, + { "nv!457425", "" }, + { "nv!4603b207", "" }, + { "nv!46574957", "" }, + { "nv!46574958", "" }, + { "nv!46813529", "" }, + { "nv!46f1e13d", "" }, + { "nv!47534c43", "" }, + { "nv!48550336", "" }, + { "nv!48576893", "" }, + { "nv!48576894", "" }, + { "nv!4889ac02", "" }, + { "nv!49005740", "" }, + { "nv!49867584", "" }, + { "nv!49960973", "" }, + { "nv!4a5341", "" }, + { "nv!4f4e48", "" }, + { "nv!4f8a0a", "" }, + { "nv!50299698", "" }, + { "nv!50299699", "" }, + { "nv!50361291", "" }, + { "nv!5242ae", "" }, + { "nv!53d30c", "" }, + { "nv!56347a", "" }, + { "nv!563a95f1", "" }, + { "nv!573823", "" }, + { "nv!58027529", "" }, + { "nv!5d2d63", "" }, + { "nv!5f7e3b", "" }, + { "nv!60461793", "" }, + { "nv!60d355", "" }, + { "nv!616627aa", "" }, + { "nv!62317182", "" }, + { "nv!6253fa2e", "" }, + { "nv!64100768", "" }, + { "nv!64100769", "" }, + { "nv!64100770", "" }, + { "nv!647395", "" }, + { "nv!66543234", "" }, + { "nv!67674763", "" }, + { "nv!67739784", "" }, + { "nv!68fb9c", "" }, + { "nv!69801276", "" }, + { "nv!6af9fa2f", "" }, + { "nv!6af9fa3f", "" }, + { "nv!6af9fa4f", "" }, + { "nv!6bd8c7", "" }, + { "nv!6c7691", "" }, + { "nv!6d4296ce", "" }, + { "nv!6dd7e7", "" }, + { "nv!6dd7e8", "" }, + { "nv!6fe11ec1", "" }, + { "nv!716511763", "" }, + { "nv!72504593", "" }, + { "nv!73304097", "" }, + { "nv!73314098", "" }, + { "nv!74095213", "" }, + { "nv!74095213a", "" }, + { "nv!74095213b", "" }, + { "nv!74095214", "" }, + { "nv!748f9649", "" }, + { "nv!75494732", "" }, + { "nv!78452832", "" }, + { "nv!784561", "" }, + { "nv!78e16b9c", "" }, + { "nv!79251225", "" }, + { "nv!7c128b", "" }, + { "nv!7ccd93", "" }, + { "nv!7df8d1", "" }, + { "nv!800c2310", "" }, + { "nv!80546710", "" }, + { "nv!80772310", "" }, + { "nv!808ee280", "" }, + { "nv!81131154", "" }, + { "nv!81274457", "" }, + { "nv!8292291f", "" }, + { "nv!83498426", "" }, + { "nv!84993794", "" }, + { "nv!84995585", "" }, + { "nv!84a0a0", "" }, + { "nv!852142", "" }, + { "nv!85612309", "" }, + { "nv!85612310", "" }, + { "nv!85612311", "" }, + { "nv!85612312", "" }, + { "nv!8623ff27", "" }, + { "nv!87364952", "" }, + { "nv!87f6275666", "" }, + { "nv!886748", "" }, + { "nv!89894423", "" }, + { "nv!8ad8a75", "" }, + { "nv!8ad8ad00", "" }, + { "nv!8bb815", "" }, + { "nv!8bb817", "" }, + { "nv!8bb818", "" }, + { "nv!8bb819", "" }, + { "nv!8e640cd1", "" }, + { "nv!8f34971a", "" }, + { "nv!8f773984", "" }, + { "nv!8f7a7d", "" }, + { "nv!902486209", "" }, + { "nv!90482571", "" }, + { "nv!91214835", "" }, + { "nv!912848290", "" }, + { "nv!915e56", "" }, + { "nv!92179063", "" }, + { "nv!92179064", "" }, + { "nv!92179065", "" }, + { "nv!92179066", "" }, + { "nv!92350358", "" }, + { "nv!92809063", "" }, + { "nv!92809064", "" }, + { "nv!92809065", "" }, + { "nv!92809066", "" }, + { "nv!92920143", "" }, + { "nv!93a89b12", "" }, + { "nv!93a89c0b", "" }, + { "nv!94812574", "" }, + { "nv!95282304", "" }, + { "nv!95394027", "" }, + { "nv!959b1f", "" }, + { "nv!9638af", "" }, + { "nv!96fd59", "" }, + { "nv!97f6275666", "" }, + { "nv!97f6275667", "" }, + { "nv!97f6275668", "" }, + { "nv!97f6275669", "" }, + { "nv!97f627566a", "" }, + { "nv!97f627566b", "" }, + { "nv!97f627566d", "" }, + { "nv!97f627566e", "" }, + { "nv!97f627566f", "" }, + { "nv!97f6275670", "" }, + { "nv!97f6275671", "" }, + { "nv!97f727566e", "" }, + { "nv!98480775", "" }, + { "nv!98480776", "" }, + { "nv!98480777", "" }, + { "nv!992431", "" }, + { "nv!9aa29065", "" }, + { "nv!9af32c", "" }, + { "nv!9af32d", "" }, + { "nv!9af32e", "" }, + { "nv!9c108b71", "" }, + { "nv!9f279065", "" }, + { "nv!a01bc728", "" }, + { "nv!a13b46c80", "" }, + { "nv!a22eb0", "" }, + { "nv!a2fb451e", "" }, + { "nv!a3456abe", "" }, + { "nv!a7044887", "" }, + { "nv!a7149200", "" }, + { "nv!a766215670", "" }, + { "nv!aac_drc_boost", "" }, + { "nv!aac_drc_cut", "" }, + { "nv!aac_drc_enc_target_level", "" }, + { "nv!aac_drc_heavy", "" }, + { "nv!aac_drc_reference_level", "" }, + { "nv!aalinegamma", "" }, + { "nv!aalinetweaks", "" }, + { "nv!ab34ee01", "" }, + { "nv!ab34ee02", "" }, + { "nv!ab34ee03", "" }, + { "nv!ac0274", "" }, + { "nv!af73c63e", "" }, + { "nv!af73c63f", "" }, + { "nv!af9927", "" }, + { "nv!afoverride", "" }, + { "nv!allocdeviceevents", "" }, + { "nv!applicationkey", "" }, + { "nv!appreturnonlybasicglsltype", "" }, + { "nv!app_softimage", "" }, + { "nv!app_supportbits2", "" }, + { "nv!assumetextureismipmappedatcreation", "" }, + { "nv!b1fb0f01", "" }, + { "nv!b3edd5", "" }, + { "nv!b40d9e03d", "" }, + { "nv!b7f6275666", "" }, + { "nv!b812c1", "" }, + { "nv!ba14ba1a", "" }, + { "nv!ba14ba1b", "" }, + { "nv!bd7559", "" }, + { "nv!bd755a", "" }, + { "nv!bd755c", "" }, + { "nv!bd755d", "" }, + { "nv!be58bb", "" }, + { "nv!be92cb", "" }, + { "nv!beefcba3", "" }, + { "nv!beefcba4", "" }, + { "nv!c023777f", "" }, + { "nv!c09dc8", "" }, + { "nv!c0d340", "" }, + { "nv!c2ff374c", "" }, + { "nv!c5e9d7a3", "" }, + { "nv!c5e9d7a4", "" }, + { "nv!c5e9d7b4", "" }, + { "nv!c618f9", "" }, + { "nv!ca345840", "" }, + { "nv!cachedisable", "" }, + { "nv!cast.on", "" }, + { "nv!cde", "" }, + { "nv!channelpriorityoverride", "" }, + { "nv!cleardatastorevidmem", "" }, + { "nv!cmdbufmemoryspaceenables", "" }, + { "nv!cmdbufminwords", "" }, + { "nv!cmdbufsizewords", "" }, + { "nv!conformantblitframebufferscissor", "" }, + { "nv!conformantincompletetextures", "" }, + { "nv!copybuffermethod", "" }, + { "nv!cubemapaniso", "" }, + { "nv!cubemapfiltering", "" }, + { "nv!d0e9a4d7", "" }, + { "nv!d13733f12", "" }, + { "nv!d1b399", "" }, + { "nv!d2983c32", "" }, + { "nv!d2983c33", "" }, + { "nv!d2e71b", "" }, + { "nv!d377dc", "" }, + { "nv!d377dd", "" }, + { "nv!d489f4", "" }, + { "nv!d4bce1", "" }, + { "nv!d518cb", "" }, + { "nv!d518cd", "" }, + { "nv!d518ce", "" }, + { "nv!d518d0", "" }, + { "nv!d518d1", "" }, + { "nv!d518d2", "" }, + { "nv!d518d3", "" }, + { "nv!d518d4", "" }, + { "nv!d518d5", "" }, + { "nv!d59eda", "" }, + { "nv!d83cbd", "" }, + { "nv!d8e777", "" }, + { "nv!debug_level", "" }, + { "nv!debug_mask", "" }, + { "nv!debug_options", "" }, + { "nv!devshmpageableallocations", "" }, + { "nv!df1f9812", "" }, + { "nv!df783c", "" }, + { "nv!diagenable", "" }, + { "nv!disallowcemask", "" }, + { "nv!disallowz16", "" }, + { "nv!dlmemoryspaceenables", "" }, + { "nv!e0bfec", "" }, + { "nv!e433456d", "" }, + { "nv!e435563f", "" }, + { "nv!e4cd9c", "" }, + { "nv!e5c972", "" }, + { "nv!e639ef", "" }, + { "nv!e802af", "" }, + { "nv!eae964", "" }, + { "nv!earlytexturehwallocation", "" }, + { "nv!eb92a3", "" }, + { "nv!ebca56", "" }, + { "nv!enable-noaud", "" }, + { "nv!enable-noavs", "" }, + { "nv!enable-prof", "" }, + { "nv!enable-sxesmode", "" }, + { "nv!enable-ulld", "" }, + { "nv!expert_detail_level", "" }, + { "nv!expert_output_mask", "" }, + { "nv!expert_report_mask", "" }, + { "nv!extensionstringnvarch", "" }, + { "nv!extensionstringversion", "" }, + { "nv!f00f1938", "" }, + { "nv!f10736", "" }, + { "nv!f1846870", "" }, + { "nv!f33bc370", "" }, + { "nv!f392a874", "" }, + { "nv!f49ae8", "" }, + { "nv!fa345cce", "" }, + { "nv!fa35cc4", "" }, + { "nv!faa14a", "" }, + { "nv!faf8a723", "" }, + { "nv!fastgs", "" }, + { "nv!fbf4ac45", "" }, + { "nv!fbo_blit_ignore_srgb", "" }, + { "nv!fc64c7", "" }, + { "nv!ff54ec97", "" }, + { "nv!ff54ec98", "" }, + { "nv!forceexitprocessdetach", "" }, + { "nv!forcerequestedesversion", "" }, + { "nv!__gl_", "" }, + { "nv!__gl_00008600", "" }, + { "nv!__gl_0007b25e", "" }, + { "nv!__gl_0083e1", "" }, + { "nv!__gl_01621887", "" }, + { "nv!__gl_03134743", "" }, + { "nv!__gl_0356afd0", "" }, + { "nv!__gl_0356afd1", "" }, + { "nv!__gl_0356afd2", "" }, + { "nv!__gl_0356afd3", "" }, + { "nv!__gl_094313", "" }, + { "nv!__gl_0x04dc09", "" }, + { "nv!__gl_0x111133", "" }, + { "nv!__gl_0x1aa483", "" }, + { "nv!__gl_0x1cb1cf", "" }, + { "nv!__gl_0x1cb1d0", "" }, + { "nv!__gl_0x1e3221", "" }, + { "nv!__gl_0x300fc8", "" }, + { "nv!__gl_0x301fc8", "" }, + { "nv!__gl_0x302fc8", "" }, + { "nv!__gl_0x3eec59", "" }, + { "nv!__gl_0x46b3ed", "" }, + { "nv!__gl_0x523dc0", "" }, + { "nv!__gl_0x523dc1", "" }, + { "nv!__gl_0x523dc2", "" }, + { "nv!__gl_0x523dc3", "" }, + { "nv!__gl_0x523dc4", "" }, + { "nv!__gl_0x523dc5", "" }, + { "nv!__gl_0x523dc6", "" }, + { "nv!__gl_0x523dd0", "" }, + { "nv!__gl_0x523dd1", "" }, + { "nv!__gl_0x523dd3", "" }, + { "nv!__gl_0x5344bb", "" }, + { "nv!__gl_0x555237", "" }, + { "nv!__gl_0x58a234", "" }, + { "nv!__gl_0x7b4428", "" }, + { "nv!__gl_0x923dc0", "" }, + { "nv!__gl_0x923dc1", "" }, + { "nv!__gl_0x923dc2", "" }, + { "nv!__gl_0x923dc3", "" }, + { "nv!__gl_0x923dc4", "" }, + { "nv!__gl_0x923dd3", "" }, + { "nv!__gl_0x9abdc5", "" }, + { "nv!__gl_0x9abdc6", "" }, + { "nv!__gl_0xaaa36c", "" }, + { "nv!__gl_0xb09da0", "" }, + { "nv!__gl_0xb09da1", "" }, + { "nv!__gl_0xb09da2", "" }, + { "nv!__gl_0xb09da3", "" }, + { "nv!__gl_0xb09da4", "" }, + { "nv!__gl_0xb09da5", "" }, + { "nv!__gl_0xb0b348", "" }, + { "nv!__gl_0xb0b349", "" }, + { "nv!__gl_0xbb558f", "" }, + { "nv!__gl_0xbd10fb", "" }, + { "nv!__gl_0xc32ad3", "" }, + { "nv!__gl_0xce2348", "" }, + { "nv!__gl_0xcfd81f", "" }, + { "nv!__gl_0xe0036b", "" }, + { "nv!__gl_0xe01f2d", "" }, + { "nv!__gl_0xe17212", "" }, + { "nv!__gl_0xeae966", "" }, + { "nv!__gl_0xed4f82", "" }, + { "nv!__gl_0xf12335", "" }, + { "nv!__gl_0xf12336", "" }, + { "nv!__gl_10261989", "" }, + { "nv!__gl_1042d483", "" }, + { "nv!__gl_10572898", "" }, + { "nv!__gl_115631", "" }, + { "nv!__gl_12950094", "" }, + { "nv!__gl_1314f311", "" }, + { "nv!__gl_1314f312", "" }, + { "nv!__gl_13279512", "" }, + { "nv!__gl_13813496", "" }, + { "nv!__gl_14507179", "" }, + { "nv!__gl_15694569", "" }, + { "nv!__gl_16936964", "" }, + { "nv!__gl_17aa230c", "" }, + { "nv!__gl_182054", "" }, + { "nv!__gl_18273275", "" }, + { "nv!__gl_18273276", "" }, + { "nv!__gl_1854d03b", "" }, + { "nv!__gl_18add00d", "" }, + { "nv!__gl_19156670", "" }, + { "nv!__gl_19286545", "" }, + { "nv!__gl_1a298e9f", "" }, + { "nv!__gl_1acf43fe", "" }, + { "nv!__gl_1bda43fe", "" }, + { "nv!__gl_1c3b92", "" }, + { "nv!__gl_21509920", "" }, + { "nv!__gl_215323457", "" }, + { "nv!__gl_2165ad", "" }, + { "nv!__gl_2165ae", "" }, + { "nv!__gl_21be9c", "" }, + { "nv!__gl_233264316", "" }, + { "nv!__gl_234557580", "" }, + { "nv!__gl_23cd0e", "" }, + { "nv!__gl_24189123", "" }, + { "nv!__gl_2443266", "" }, + { "nv!__gl_25025519", "" }, + { "nv!__gl_255e39", "" }, + { "nv!__gl_2583364", "" }, + { "nv!__gl_2888c1", "" }, + { "nv!__gl_28ca3e", "" }, + { "nv!__gl_29871243", "" }, + { "nv!__gl_2a1f64", "" }, + { "nv!__gl_2dc432", "" }, + { "nv!__gl_2de437", "" }, + { "nv!__gl_2f3bb89c", "" }, + { "nv!__gl_2fd652", "" }, + { "nv!__gl_3001ac", "" }, + { "nv!__gl_31298772", "" }, + { "nv!__gl_313233", "" }, + { "nv!__gl_31f7d603", "" }, + { "nv!__gl_320ce4", "" }, + { "nv!__gl_32153248", "" }, + { "nv!__gl_32153249", "" }, + { "nv!__gl_335bca", "" }, + { "nv!__gl_342abb", "" }, + { "nv!__gl_34dfe6", "" }, + { "nv!__gl_34dfe7", "" }, + { "nv!__gl_34dfe8", "" }, + { "nv!__gl_34dfe9", "" }, + { "nv!__gl_35201578", "" }, + { "nv!__gl_359278", "" }, + { "nv!__gl_37f53a", "" }, + { "nv!__gl_38144972", "" }, + { "nv!__gl_38542646", "" }, + { "nv!__gl_3b74c9", "" }, + { "nv!__gl_3c136f", "" }, + { "nv!__gl_3cf72823", "" }, + { "nv!__gl_3d7af029", "" }, + { "nv!__gl_3ff34782", "" }, + { "nv!__gl_4129618", "" }, + { "nv!__gl_4189fac3", "" }, + { "nv!__gl_420bd4", "" }, + { "nv!__gl_42a699", "" }, + { "nv!__gl_441369", "" }, + { "nv!__gl_4458713e", "" }, + { "nv!__gl_4554b6", "" }, + { "nv!__gl_457425", "" }, + { "nv!__gl_4603b207", "" }, + { "nv!__gl_46574957", "" }, + { "nv!__gl_46574958", "" }, + { "nv!__gl_46813529", "" }, + { "nv!__gl_46f1e13d", "" }, + { "nv!__gl_47534c43", "" }, + { "nv!__gl_48550336", "" }, + { "nv!__gl_48576893", "" }, + { "nv!__gl_48576894", "" }, + { "nv!__gl_4889ac02", "" }, + { "nv!__gl_49005740", "" }, + { "nv!__gl_49867584", "" }, + { "nv!__gl_49960973", "" }, + { "nv!__gl_4a5341", "" }, + { "nv!__gl_4f4e48", "" }, + { "nv!__gl_4f8a0a", "" }, + { "nv!__gl_50299698", "" }, + { "nv!__gl_50299699", "" }, + { "nv!__gl_50361291", "" }, + { "nv!__gl_5242ae", "" }, + { "nv!__gl_53d30c", "" }, + { "nv!__gl_56347a", "" }, + { "nv!__gl_563a95f1", "" }, + { "nv!__gl_573823", "" }, + { "nv!__gl_58027529", "" }, + { "nv!__gl_5d2d63", "" }, + { "nv!__gl_5f7e3b", "" }, + { "nv!__gl_60461793", "" }, + { "nv!__gl_60d355", "" }, + { "nv!__gl_616627aa", "" }, + { "nv!__gl_62317182", "" }, + { "nv!__gl_6253fa2e", "" }, + { "nv!__gl_64100768", "" }, + { "nv!__gl_64100769", "" }, + { "nv!__gl_64100770", "" }, + { "nv!__gl_647395", "" }, + { "nv!__gl_66543234", "" }, + { "nv!__gl_67674763", "" }, + { "nv!__gl_67739784", "" }, + { "nv!__gl_68fb9c", "" }, + { "nv!__gl_69801276", "" }, + { "nv!__gl_6af9fa2f", "" }, + { "nv!__gl_6af9fa3f", "" }, + { "nv!__gl_6af9fa4f", "" }, + { "nv!__gl_6bd8c7", "" }, + { "nv!__gl_6c7691", "" }, + { "nv!__gl_6d4296ce", "" }, + { "nv!__gl_6dd7e7", "" }, + { "nv!__gl_6dd7e8", "" }, + { "nv!__gl_6fe11ec1", "" }, + { "nv!__gl_716511763", "" }, + { "nv!__gl_72504593", "" }, + { "nv!__gl_73304097", "" }, + { "nv!__gl_73314098", "" }, + { "nv!__gl_74095213", "" }, + { "nv!__gl_74095213a", "" }, + { "nv!__gl_74095213b", "" }, + { "nv!__gl_74095214", "" }, + { "nv!__gl_748f9649", "" }, + { "nv!__gl_75494732", "" }, + { "nv!__gl_78452832", "" }, + { "nv!__gl_784561", "" }, + { "nv!__gl_78e16b9c", "" }, + { "nv!__gl_79251225", "" }, + { "nv!__gl_7c128b", "" }, + { "nv!__gl_7ccd93", "" }, + { "nv!__gl_7df8d1", "" }, + { "nv!__gl_800c2310", "" }, + { "nv!__gl_80546710", "" }, + { "nv!__gl_80772310", "" }, + { "nv!__gl_808ee280", "" }, + { "nv!__gl_81131154", "" }, + { "nv!__gl_81274457", "" }, + { "nv!__gl_8292291f", "" }, + { "nv!__gl_83498426", "" }, + { "nv!__gl_84993794", "" }, + { "nv!__gl_84995585", "" }, + { "nv!__gl_84a0a0", "" }, + { "nv!__gl_852142", "" }, + { "nv!__gl_85612309", "" }, + { "nv!__gl_85612310", "" }, + { "nv!__gl_85612311", "" }, + { "nv!__gl_85612312", "" }, + { "nv!__gl_8623ff27", "" }, + { "nv!__gl_87364952", "" }, + { "nv!__gl_87f6275666", "" }, + { "nv!__gl_886748", "" }, + { "nv!__gl_89894423", "" }, + { "nv!__gl_8ad8a75", "" }, + { "nv!__gl_8ad8ad00", "" }, + { "nv!__gl_8bb815", "" }, + { "nv!__gl_8bb817", "" }, + { "nv!__gl_8bb818", "" }, + { "nv!__gl_8bb819", "" }, + { "nv!__gl_8e640cd1", "" }, + { "nv!__gl_8f34971a", "" }, + { "nv!__gl_8f773984", "" }, + { "nv!__gl_8f7a7d", "" }, + { "nv!__gl_902486209", "" }, + { "nv!__gl_90482571", "" }, + { "nv!__gl_91214835", "" }, + { "nv!__gl_912848290", "" }, + { "nv!__gl_915e56", "" }, + { "nv!__gl_92179063", "" }, + { "nv!__gl_92179064", "" }, + { "nv!__gl_92179065", "" }, + { "nv!__gl_92179066", "" }, + { "nv!__gl_92350358", "" }, + { "nv!__gl_92809063", "" }, + { "nv!__gl_92809064", "" }, + { "nv!__gl_92809065", "" }, + { "nv!__gl_92809066", "" }, + { "nv!__gl_92920143", "" }, + { "nv!__gl_93a89b12", "" }, + { "nv!__gl_93a89c0b", "" }, + { "nv!__gl_94812574", "" }, + { "nv!__gl_95282304", "" }, + { "nv!__gl_95394027", "" }, + { "nv!__gl_959b1f", "" }, + { "nv!__gl_9638af", "" }, + { "nv!__gl_96fd59", "" }, + { "nv!__gl_97f6275666", "" }, + { "nv!__gl_97f6275667", "" }, + { "nv!__gl_97f6275668", "" }, + { "nv!__gl_97f6275669", "" }, + { "nv!__gl_97f627566a", "" }, + { "nv!__gl_97f627566b", "" }, + { "nv!__gl_97f627566d", "" }, + { "nv!__gl_97f627566e", "" }, + { "nv!__gl_97f627566f", "" }, + { "nv!__gl_97f6275670", "" }, + { "nv!__gl_97f6275671", "" }, + { "nv!__gl_97f727566e", "" }, + { "nv!__gl_98480775", "" }, + { "nv!__gl_98480776", "" }, + { "nv!__gl_98480777", "" }, + { "nv!__gl_992431", "" }, + { "nv!__gl_9aa29065", "" }, + { "nv!__gl_9af32c", "" }, + { "nv!__gl_9af32d", "" }, + { "nv!__gl_9af32e", "" }, + { "nv!__gl_9c108b71", "" }, + { "nv!__gl_9f279065", "" }, + { "nv!__gl_a01bc728", "" }, + { "nv!__gl_a13b46c80", "" }, + { "nv!__gl_a22eb0", "" }, + { "nv!__gl_a2fb451e", "" }, + { "nv!__gl_a3456abe", "" }, + { "nv!__gl_a7044887", "" }, + { "nv!__gl_a7149200", "" }, + { "nv!__gl_a766215670", "" }, + { "nv!__gl_aalinegamma", "" }, + { "nv!__gl_aalinetweaks", "" }, + { "nv!__gl_ab34ee01", "" }, + { "nv!__gl_ab34ee02", "" }, + { "nv!__gl_ab34ee03", "" }, + { "nv!__gl_ac0274", "" }, + { "nv!__gl_af73c63e", "" }, + { "nv!__gl_af73c63f", "" }, + { "nv!__gl_af9927", "" }, + { "nv!__gl_afoverride", "" }, + { "nv!__gl_allocdeviceevents", "" }, + { "nv!__gl_applicationkey", "" }, + { "nv!__gl_appreturnonlybasicglsltype", "" }, + { "nv!__gl_app_softimage", "" }, + { "nv!__gl_app_supportbits2", "" }, + { "nv!__gl_assumetextureismipmappedatcreation", "" }, + { "nv!__gl_b1fb0f01", "" }, + { "nv!__gl_b3edd5", "" }, + { "nv!__gl_b40d9e03d", "" }, + { "nv!__gl_b7f6275666", "" }, + { "nv!__gl_b812c1", "" }, + { "nv!__gl_ba14ba1a", "" }, + { "nv!__gl_ba14ba1b", "" }, + { "nv!__gl_bd7559", "" }, + { "nv!__gl_bd755a", "" }, + { "nv!__gl_bd755c", "" }, + { "nv!__gl_bd755d", "" }, + { "nv!__gl_be58bb", "" }, + { "nv!__gl_be92cb", "" }, + { "nv!__gl_beefcba3", "" }, + { "nv!__gl_beefcba4", "" }, + { "nv!__gl_c023777f", "" }, + { "nv!__gl_c09dc8", "" }, + { "nv!__gl_c0d340", "" }, + { "nv!__gl_c2ff374c", "" }, + { "nv!__gl_c5e9d7a3", "" }, + { "nv!__gl_c5e9d7a4", "" }, + { "nv!__gl_c5e9d7b4", "" }, + { "nv!__gl_c618f9", "" }, + { "nv!__gl_ca345840", "" }, + { "nv!__gl_cachedisable", "" }, + { "nv!__gl_channelpriorityoverride", "" }, + { "nv!__gl_cleardatastorevidmem", "" }, + { "nv!__gl_cmdbufmemoryspaceenables", "" }, + { "nv!__gl_cmdbufminwords", "" }, + { "nv!__gl_cmdbufsizewords", "" }, + { "nv!__gl_conformantblitframebufferscissor", "" }, + { "nv!__gl_conformantincompletetextures", "" }, + { "nv!__gl_copybuffermethod", "" }, + { "nv!__gl_cubemapaniso", "" }, + { "nv!__gl_cubemapfiltering", "" }, + { "nv!__gl_d0e9a4d7", "" }, + { "nv!__gl_d13733f12", "" }, + { "nv!__gl_d1b399", "" }, + { "nv!__gl_d2983c32", "" }, + { "nv!__gl_d2983c33", "" }, + { "nv!__gl_d2e71b", "" }, + { "nv!__gl_d377dc", "" }, + { "nv!__gl_d377dd", "" }, + { "nv!__gl_d489f4", "" }, + { "nv!__gl_d4bce1", "" }, + { "nv!__gl_d518cb", "" }, + { "nv!__gl_d518cd", "" }, + { "nv!__gl_d518ce", "" }, + { "nv!__gl_d518d0", "" }, + { "nv!__gl_d518d1", "" }, + { "nv!__gl_d518d2", "" }, + { "nv!__gl_d518d3", "" }, + { "nv!__gl_d518d4", "" }, + { "nv!__gl_d518d5", "" }, + { "nv!__gl_d59eda", "" }, + { "nv!__gl_d83cbd", "" }, + { "nv!__gl_d8e777", "" }, + { "nv!__gl_debug_level", "" }, + { "nv!__gl_debug_mask", "" }, + { "nv!__gl_debug_options", "" }, + { "nv!__gl_devshmpageableallocations", "" }, + { "nv!__gl_df1f9812", "" }, + { "nv!__gl_df783c", "" }, + { "nv!__gl_diagenable", "" }, + { "nv!__gl_disallowcemask", "" }, + { "nv!__gl_disallowz16", "" }, + { "nv!__gl_dlmemoryspaceenables", "" }, + { "nv!__gl_e0bfec", "" }, + { "nv!__gl_e433456d", "" }, + { "nv!__gl_e435563f", "" }, + { "nv!__gl_e4cd9c", "" }, + { "nv!__gl_e5c972", "" }, + { "nv!__gl_e639ef", "" }, + { "nv!__gl_e802af", "" }, + { "nv!__gl_eae964", "" }, + { "nv!__gl_earlytexturehwallocation", "" }, + { "nv!__gl_eb92a3", "" }, + { "nv!__gl_ebca56", "" }, + { "nv!__gl_expert_detail_level", "" }, + { "nv!__gl_expert_output_mask", "" }, + { "nv!__gl_expert_report_mask", "" }, + { "nv!__gl_extensionstringnvarch", "" }, + { "nv!__gl_extensionstringversion", "" }, + { "nv!__gl_f00f1938", "" }, + { "nv!__gl_f10736", "" }, + { "nv!__gl_f1846870", "" }, + { "nv!__gl_f33bc370", "" }, + { "nv!__gl_f392a874", "" }, + { "nv!__gl_f49ae8", "" }, + { "nv!__gl_fa345cce", "" }, + { "nv!__gl_fa35cc4", "" }, + { "nv!__gl_faa14a", "" }, + { "nv!__gl_faf8a723", "" }, + { "nv!__gl_fastgs", "" }, + { "nv!__gl_fbf4ac45", "" }, + { "nv!__gl_fbo_blit_ignore_srgb", "" }, + { "nv!__gl_fc64c7", "" }, + { "nv!__gl_ff54ec97", "" }, + { "nv!__gl_ff54ec98", "" }, + { "nv!__gl_forceexitprocessdetach", "" }, + { "nv!__gl_forcerequestedesversion", "" }, + { "nv!__gl_glsynctovblank", "" }, + { "nv!__gl_gvitimeoutcontrol", "" }, + { "nv!__gl_hcctrl", "" }, + { "nv!__gl_hwstate_per_ctx", "" }, + { "nv!__gl_machinecachelimit", "" }, + { "nv!__gl_maxframesallowed", "" }, + { "nv!__gl_memmgrcachedalloclimit", "" }, + { "nv!__gl_memmgrcachedalloclimitratio", "" }, + { "nv!__gl_memmgrsysheapalloclimit", "" }, + { "nv!__gl_memmgrsysheapalloclimitratio", "" }, + { "nv!__gl_memmgrvidheapalloclimit", "" }, + { "nv!__gl_mosaic_clip_to_subdev", "" }, + { "nv!__gl_mosaic_clip_to_subdev_h_overlap", "" }, + { "nv!__gl_mosaic_clip_to_subdev_v_overlap", "" }, + { "nv!__gl_overlaymergeblittimerms", "" }, + { "nv!__gl_perfmon_mode", "" }, + { "nv!__gl_pixbar_mode", "" }, + { "nv!__gl_qualityenhancements", "" }, + { "nv!__gl_r27s18q28", "" }, + { "nv!__gl_r2d7c1d8", "" }, + { "nv!__gl_renderer", "" }, + { "nv!__gl_renderqualityflags", "" }, + { "nv!__gl_s3tcquality", "" }, + { "nv!__gl_shaderatomics", "" }, + { "nv!__gl_shadercacheinitsize", "" }, + { "nv!__gl_shader_disk_cache_path", "" }, + { "nv!__gl_shader_disk_cache_read_only", "" }, + { "nv!__gl_shaderobjects", "" }, + { "nv!__gl_shaderportabilitywarnings", "" }, + { "nv!__gl_shaderwarningsaserrors", "" }, + { "nv!__gl_skiptexturehostcopies", "" }, + { "nv!__glslc_debug_level", "" }, + { "nv!__glslc_debug_mask", "" }, + { "nv!__glslc_debug_options", "" }, + { "nv!__glslc_debug_filename", "" }, + { "nv!__gl_sli_dli_control", "" }, + { "nv!__gl_sparsetexture", "" }, + { "nv!__gl_spinlooptimeout", "" }, + { "nv!__gl_sync_to_vblank", "" }, + { "nv!glsynctovblank", "" }, + { "nv!__gl_sysheapreuseratio", "" }, + { "nv!__gl_sysmemtexturepromotion", "" }, + { "nv!__gl_targetflushcount", "" }, + { "nv!__gl_tearingfreeswappresent", "" }, + { "nv!__gl_texclampbehavior", "" }, + { "nv!__gl_texlodbias", "" }, + { "nv!__gl_texmemoryspaceenables", "" }, + { "nv!__gl_textureprecache", "" }, + { "nv!__gl_threadcontrol", "" }, + { "nv!__gl_threadcontrol2", "" }, + { "nv!__gl_usegvievents", "" }, + { "nv!__gl_vbomemoryspaceenables", "" }, + { "nv!__gl_vertexlimit", "" }, + { "nv!__gl_vidheapreuseratio", "" }, + { "nv!__gl_vpipe", "" }, + { "nv!__gl_vpipeformatbloatlimit", "" }, + { "nv!__gl_wglmessageboxonabort", "" }, + { "nv!__gl_writeinfolog", "" }, + { "nv!__gl_writeprogramobjectassembly", "" }, + { "nv!__gl_writeprogramobjectsource", "" }, + { "nv!__gl_xnvadapterpresent", "" }, + { "nv!__gl_yield", "" }, + { "nv!__gl_yieldfunction", "" }, + { "nv!__gl_yieldfunctionfast", "" }, + { "nv!__gl_yieldfunctionslow", "" }, + { "nv!__gl_yieldfunctionwaitfordcqueue", "" }, + { "nv!__gl_yieldfunctionwaitforframe", "" }, + { "nv!__gl_yieldfunctionwaitforgpu", "" }, + { "nv!__gl_zbctableaddhysteresis", "" }, + { "nv!gpu_debug_mode", "" }, + { "nv!gpu_stay_on", "" }, + { "nv!gpu_timeout_ms_max", "" }, + { "nv!gvitimeoutcontrol", "" }, + { "nv!hcctrl", "" }, + { "nv!hwstate_per_ctx", "" }, + { "nv!libandroid_enable_log", "" }, + { "nv!machinecachelimit", "" }, + { "nv!maxframesallowed", "" }, + { "nv!media.aac_51_output_enabled", "" }, + { "nv!memmgrcachedalloclimit", "" }, + { "nv!memmgrcachedalloclimitratio", "" }, + { "nv!memmgrsysheapalloclimit", "" }, + { "nv!memmgrsysheapalloclimitratio", "" }, + { "nv!memmgrvidheapalloclimit", "" }, + { "nv!mosaic_clip_to_subdev", "" }, + { "nv!mosaic_clip_to_subdev_h_overlap", "" }, + { "nv!mosaic_clip_to_subdev_v_overlap", "" }, + { "nv!nvblit.dump", "" }, + { "nv!nvblit.profile", "" }, + { "nv!nvblit.twod", "" }, + { "nv!nvblit.vic", "" }, + { "nv!nvddk_vic_prevent_use", "" }, + { "nv!nv_decompression", "" }, + { "nv!nvdisp_bl_ctrl", "0" }, + { "nv!nvdisp_debug_mask", "" }, + { "nv!nvdisp_enable_ts", "0" }, + { "nv!nvhdcp_timeout_ms", "12000" }, + { "nv!nvhdcp_max_retries", "5" }, + { "nv!nv_emc_dvfs_test", "" }, + { "nv!nv_emc_init_rate_hz", "" }, + { "nv!nv_gmmu_va_page_split", "" }, + { "nv!nv_gmmu_va_range", "" }, + { "nv!nvhost_debug_mask", "" }, + { "nv!nvidia.hwc.dump_config", "" }, + { "nv!nvidia.hwc.dump_layerlist", "" }, + { "nv!nvidia.hwc.dump_windows", "" }, + { "nv!nvidia.hwc.enable_disp_trans", "" }, + { "nv!nvidia.hwc.ftrace_enable", "" }, + { "nv!nvidia.hwc.hdcp_enable", "" }, + { "nv!nvidia.hwc.hidden_window_mask0", "" }, + { "nv!nvidia.hwc.hidden_window_mask1", "" }, + { "nv!nvidia.hwc.immediate_modeset", "" }, + { "nv!nvidia.hwc.imp_enable", "" }, + { "nv!nvidia.hwc.no_egl", "" }, + { "nv!nvidia.hwc.no_scratchblit", "" }, + { "nv!nvidia.hwc.no_vic", "" }, + { "nv!nvidia.hwc.null_display", "" }, + { "nv!nvidia.hwc.scan_props", "" }, + { "nv!nvidia.hwc.swap_interval", "" }, + { "nv!nvidia.hwc.war_1515812", "0" }, + { "nv!nvmap_debug_mask", "" }, + { "nv!nv_memory_profiler", "" }, + { "nv!nvnflinger_enable_log", "" }, + { "nv!nvnflinger_flip_policy", "" }, + { "nv!nvnflinger_hotplug_autoswitch", "0" }, + { "nv!nvnflinger_prefer_primary_layer", "0" }, + { "nv!nvnflinger_service_priority", "" }, + { "nv!nvnflinger_service_threads", "" }, + { "nv!nvnflinger_swap_interval", "" }, + { "nv!nvnflinger_track_perf", "" }, + { "nv!nvnflinger_virtualdisplay_policy", "60hz" }, + { "nv!nvn_no_vsync_capability", false }, + { "nv!nvn_through_opengl", "" }, + { "nv!nv_pllcx_always_on", "" }, + { "nv!nv_pllcx_safe_div", "" }, + { "nv!nvrm_gpu_channel_interleave", "" }, + { "nv!nvrm_gpu_channel_priority", "" }, + { "nv!nvrm_gpu_channel_timeslice", "" }, + { "nv!nvrm_gpu_default_device_index", "" }, + { "nv!nvrm_gpu_dummy", "" }, + { "nv!nvrm_gpu_help", "" }, + { "nv!nvrm_gpu_nvgpu_disable", "" }, + { "nv!nvrm_gpu_nvgpu_do_nfa_partial_map", "" }, + { "nv!nvrm_gpu_nvgpu_ecc_overrides", "" }, + { "nv!nvrm_gpu_nvgpu_no_as_get_va_regions", "" }, + { "nv!nvrm_gpu_nvgpu_no_channel_abort", "" }, + { "nv!nvrm_gpu_nvgpu_no_cyclestats", "" }, + { "nv!nvrm_gpu_nvgpu_no_fixed", "" }, + { "nv!nvrm_gpu_nvgpu_no_gpu_characteristics", "" }, + { "nv!nvrm_gpu_nvgpu_no_ioctl_mutex", "" }, + { "nv!nvrm_gpu_nvgpu_no_map_buffer_ex", "" }, + { "nv!nvrm_gpu_nvgpu_no_robustness", "" }, + { "nv!nvrm_gpu_nvgpu_no_sparse", "" }, + { "nv!nvrm_gpu_nvgpu_no_syncpoints", "" }, + { "nv!nvrm_gpu_nvgpu_no_tsg", "" }, + { "nv!nvrm_gpu_nvgpu_no_zbc", "" }, + { "nv!nvrm_gpu_nvgpu_no_zcull", "" }, + { "nv!nvrm_gpu_nvgpu_wrap_channels_in_tsgs", "" }, + { "nv!nvrm_gpu_prevent_use", "" }, + { "nv!nvrm_gpu_trace", "" }, + { "nv!nvsched_debug_mask", "" }, + { "nv!nvsched_force_enable", "" }, + { "nv!nvsched_force_log", "" }, + { "nv!nv_usb_plls_hw_ctrl", "" }, + { "nv!nv_winsys", "" }, + { "nv!nvwsi_dump", "" }, + { "nv!nvwsi_fill", "" }, + { "nv!ogl_", "" }, + { "nv!ogl_0356afd0", "" }, + { "nv!ogl_0356afd1", "" }, + { "nv!ogl_0356afd2", "" }, + { "nv!ogl_0356afd3", "" }, + { "nv!ogl_0x923dc0", "" }, + { "nv!ogl_0x923dc1", "" }, + { "nv!ogl_0x923dc2", "" }, + { "nv!ogl_0x923dc3", "" }, + { "nv!ogl_0x923dc4", "" }, + { "nv!ogl_0x923dd3", "" }, + { "nv!ogl_0x9abdc5", "" }, + { "nv!ogl_0x9abdc6", "" }, + { "nv!ogl_0xbd10fb", "" }, + { "nv!ogl_0xce2348", "" }, + { "nv!ogl_10261989", "" }, + { "nv!ogl_1042d483", "" }, + { "nv!ogl_10572898", "" }, + { "nv!ogl_115631", "" }, + { "nv!ogl_12950094", "" }, + { "nv!ogl_1314f311", "" }, + { "nv!ogl_1314f312", "" }, + { "nv!ogl_13279512", "" }, + { "nv!ogl_13813496", "" }, + { "nv!ogl_14507179", "" }, + { "nv!ogl_15694569", "" }, + { "nv!ogl_16936964", "" }, + { "nv!ogl_17aa230c", "" }, + { "nv!ogl_182054", "" }, + { "nv!ogl_18273275", "" }, + { "nv!ogl_18273276", "" }, + { "nv!ogl_1854d03b", "" }, + { "nv!ogl_18add00d", "" }, + { "nv!ogl_19156670", "" }, + { "nv!ogl_19286545", "" }, + { "nv!ogl_1a298e9f", "" }, + { "nv!ogl_1acf43fe", "" }, + { "nv!ogl_1bda43fe", "" }, + { "nv!ogl_1c3b92", "" }, + { "nv!ogl_21509920", "" }, + { "nv!ogl_215323457", "" }, + { "nv!ogl_2165ad", "" }, + { "nv!ogl_2165ae", "" }, + { "nv!ogl_21be9c", "" }, + { "nv!ogl_233264316", "" }, + { "nv!ogl_234557580", "" }, + { "nv!ogl_23cd0e", "" }, + { "nv!ogl_24189123", "" }, + { "nv!ogl_2443266", "" }, + { "nv!ogl_25025519", "" }, + { "nv!ogl_255e39", "" }, + { "nv!ogl_2583364", "" }, + { "nv!ogl_2888c1", "" }, + { "nv!ogl_28ca3e", "" }, + { "nv!ogl_29871243", "" }, + { "nv!ogl_2a1f64", "" }, + { "nv!ogl_2dc432", "" }, + { "nv!ogl_2de437", "" }, + { "nv!ogl_2f3bb89c", "" }, + { "nv!ogl_2fd652", "" }, + { "nv!ogl_3001ac", "" }, + { "nv!ogl_31298772", "" }, + { "nv!ogl_313233", "" }, + { "nv!ogl_31f7d603", "" }, + { "nv!ogl_320ce4", "" }, + { "nv!ogl_32153248", "" }, + { "nv!ogl_32153249", "" }, + { "nv!ogl_335bca", "" }, + { "nv!ogl_342abb", "" }, + { "nv!ogl_34dfe6", "" }, + { "nv!ogl_34dfe7", "" }, + { "nv!ogl_34dfe8", "" }, + { "nv!ogl_34dfe9", "" }, + { "nv!ogl_35201578", "" }, + { "nv!ogl_359278", "" }, + { "nv!ogl_37f53a", "" }, + { "nv!ogl_38144972", "" }, + { "nv!ogl_38542646", "" }, + { "nv!ogl_3b74c9", "" }, + { "nv!ogl_3c136f", "" }, + { "nv!ogl_3cf72823", "" }, + { "nv!ogl_3d7af029", "" }, + { "nv!ogl_3ff34782", "" }, + { "nv!ogl_4129618", "" }, + { "nv!ogl_4189fac3", "" }, + { "nv!ogl_420bd4", "" }, + { "nv!ogl_42a699", "" }, + { "nv!ogl_441369", "" }, + { "nv!ogl_4458713e", "" }, + { "nv!ogl_4554b6", "" }, + { "nv!ogl_457425", "" }, + { "nv!ogl_4603b207", "" }, + { "nv!ogl_46574957", "" }, + { "nv!ogl_46574958", "" }, + { "nv!ogl_46813529", "" }, + { "nv!ogl_46f1e13d", "" }, + { "nv!ogl_47534c43", "" }, + { "nv!ogl_48550336", "" }, + { "nv!ogl_48576893", "" }, + { "nv!ogl_48576894", "" }, + { "nv!ogl_4889ac02", "" }, + { "nv!ogl_49005740", "" }, + { "nv!ogl_49867584", "" }, + { "nv!ogl_49960973", "" }, + { "nv!ogl_4a5341", "" }, + { "nv!ogl_4f4e48", "" }, + { "nv!ogl_4f8a0a", "" }, + { "nv!ogl_50299698", "" }, + { "nv!ogl_50299699", "" }, + { "nv!ogl_50361291", "" }, + { "nv!ogl_5242ae", "" }, + { "nv!ogl_53d30c", "" }, + { "nv!ogl_56347a", "" }, + { "nv!ogl_563a95f1", "" }, + { "nv!ogl_573823", "" }, + { "nv!ogl_58027529", "" }, + { "nv!ogl_5d2d63", "" }, + { "nv!ogl_5f7e3b", "" }, + { "nv!ogl_60461793", "" }, + { "nv!ogl_60d355", "" }, + { "nv!ogl_616627aa", "" }, + { "nv!ogl_62317182", "" }, + { "nv!ogl_6253fa2e", "" }, + { "nv!ogl_64100768", "" }, + { "nv!ogl_64100769", "" }, + { "nv!ogl_64100770", "" }, + { "nv!ogl_647395", "" }, + { "nv!ogl_66543234", "" }, + { "nv!ogl_67674763", "" }, + { "nv!ogl_67739784", "" }, + { "nv!ogl_68fb9c", "" }, + { "nv!ogl_69801276", "" }, + { "nv!ogl_6af9fa2f", "" }, + { "nv!ogl_6af9fa3f", "" }, + { "nv!ogl_6af9fa4f", "" }, + { "nv!ogl_6bd8c7", "" }, + { "nv!ogl_6c7691", "" }, + { "nv!ogl_6d4296ce", "" }, + { "nv!ogl_6dd7e7", "" }, + { "nv!ogl_6dd7e8", "" }, + { "nv!ogl_6fe11ec1", "" }, + { "nv!ogl_716511763", "" }, + { "nv!ogl_72504593", "" }, + { "nv!ogl_73304097", "" }, + { "nv!ogl_73314098", "" }, + { "nv!ogl_74095213", "" }, + { "nv!ogl_74095213a", "" }, + { "nv!ogl_74095213b", "" }, + { "nv!ogl_74095214", "" }, + { "nv!ogl_748f9649", "" }, + { "nv!ogl_75494732", "" }, + { "nv!ogl_78452832", "" }, + { "nv!ogl_784561", "" }, + { "nv!ogl_78e16b9c", "" }, + { "nv!ogl_79251225", "" }, + { "nv!ogl_7c128b", "" }, + { "nv!ogl_7ccd93", "" }, + { "nv!ogl_7df8d1", "" }, + { "nv!ogl_800c2310", "" }, + { "nv!ogl_80546710", "" }, + { "nv!ogl_80772310", "" }, + { "nv!ogl_808ee280", "" }, + { "nv!ogl_81131154", "" }, + { "nv!ogl_81274457", "" }, + { "nv!ogl_8292291f", "" }, + { "nv!ogl_83498426", "" }, + { "nv!ogl_84993794", "" }, + { "nv!ogl_84995585", "" }, + { "nv!ogl_84a0a0", "" }, + { "nv!ogl_852142", "" }, + { "nv!ogl_85612309", "" }, + { "nv!ogl_85612310", "" }, + { "nv!ogl_85612311", "" }, + { "nv!ogl_85612312", "" }, + { "nv!ogl_8623ff27", "" }, + { "nv!ogl_87364952", "" }, + { "nv!ogl_87f6275666", "" }, + { "nv!ogl_886748", "" }, + { "nv!ogl_89894423", "" }, + { "nv!ogl_8ad8a75", "" }, + { "nv!ogl_8ad8ad00", "" }, + { "nv!ogl_8bb815", "" }, + { "nv!ogl_8bb817", "" }, + { "nv!ogl_8bb818", "" }, + { "nv!ogl_8bb819", "" }, + { "nv!ogl_8e640cd1", "" }, + { "nv!ogl_8f34971a", "" }, + { "nv!ogl_8f773984", "" }, + { "nv!ogl_8f7a7d", "" }, + { "nv!ogl_902486209", "" }, + { "nv!ogl_90482571", "" }, + { "nv!ogl_91214835", "" }, + { "nv!ogl_912848290", "" }, + { "nv!ogl_915e56", "" }, + { "nv!ogl_92179063", "" }, + { "nv!ogl_92179064", "" }, + { "nv!ogl_92179065", "" }, + { "nv!ogl_92179066", "" }, + { "nv!ogl_92350358", "" }, + { "nv!ogl_92809063", "" }, + { "nv!ogl_92809064", "" }, + { "nv!ogl_92809065", "" }, + { "nv!ogl_92809066", "" }, + { "nv!ogl_92920143", "" }, + { "nv!ogl_93a89b12", "" }, + { "nv!ogl_93a89c0b", "" }, + { "nv!ogl_94812574", "" }, + { "nv!ogl_95282304", "" }, + { "nv!ogl_95394027", "" }, + { "nv!ogl_959b1f", "" }, + { "nv!ogl_9638af", "" }, + { "nv!ogl_96fd59", "" }, + { "nv!ogl_97f6275666", "" }, + { "nv!ogl_97f6275667", "" }, + { "nv!ogl_97f6275668", "" }, + { "nv!ogl_97f6275669", "" }, + { "nv!ogl_97f627566a", "" }, + { "nv!ogl_97f627566b", "" }, + { "nv!ogl_97f627566d", "" }, + { "nv!ogl_97f627566e", "" }, + { "nv!ogl_97f627566f", "" }, + { "nv!ogl_97f6275670", "" }, + { "nv!ogl_97f6275671", "" }, + { "nv!ogl_97f727566e", "" }, + { "nv!ogl_98480775", "" }, + { "nv!ogl_98480776", "" }, + { "nv!ogl_98480777", "" }, + { "nv!ogl_992431", "" }, + { "nv!ogl_9aa29065", "" }, + { "nv!ogl_9af32c", "" }, + { "nv!ogl_9af32d", "" }, + { "nv!ogl_9af32e", "" }, + { "nv!ogl_9c108b71", "" }, + { "nv!ogl_9f279065", "" }, + { "nv!ogl_a01bc728", "" }, + { "nv!ogl_a13b46c80", "" }, + { "nv!ogl_a22eb0", "" }, + { "nv!ogl_a2fb451e", "" }, + { "nv!ogl_a3456abe", "" }, + { "nv!ogl_a7044887", "" }, + { "nv!ogl_a7149200", "" }, + { "nv!ogl_a766215670", "" }, + { "nv!ogl_aalinegamma", "" }, + { "nv!ogl_aalinetweaks", "" }, + { "nv!ogl_ab34ee01", "" }, + { "nv!ogl_ab34ee02", "" }, + { "nv!ogl_ab34ee03", "" }, + { "nv!ogl_ac0274", "" }, + { "nv!ogl_af73c63e", "" }, + { "nv!ogl_af73c63f", "" }, + { "nv!ogl_af9927", "" }, + { "nv!ogl_afoverride", "" }, + { "nv!ogl_allocdeviceevents", "" }, + { "nv!ogl_applicationkey", "" }, + { "nv!ogl_appreturnonlybasicglsltype", "" }, + { "nv!ogl_app_softimage", "" }, + { "nv!ogl_app_supportbits2", "" }, + { "nv!ogl_assumetextureismipmappedatcreation", "" }, + { "nv!ogl_b1fb0f01", "" }, + { "nv!ogl_b3edd5", "" }, + { "nv!ogl_b40d9e03d", "" }, + { "nv!ogl_b7f6275666", "" }, + { "nv!ogl_b812c1", "" }, + { "nv!ogl_ba14ba1a", "" }, + { "nv!ogl_ba14ba1b", "" }, + { "nv!ogl_bd7559", "" }, + { "nv!ogl_bd755a", "" }, + { "nv!ogl_bd755c", "" }, + { "nv!ogl_bd755d", "" }, + { "nv!ogl_be58bb", "" }, + { "nv!ogl_be92cb", "" }, + { "nv!ogl_beefcba3", "" }, + { "nv!ogl_beefcba4", "" }, + { "nv!ogl_c023777f", "" }, + { "nv!ogl_c09dc8", "" }, + { "nv!ogl_c0d340", "" }, + { "nv!ogl_c2ff374c", "" }, + { "nv!ogl_c5e9d7a3", "" }, + { "nv!ogl_c5e9d7a4", "" }, + { "nv!ogl_c5e9d7b4", "" }, + { "nv!ogl_c618f9", "" }, + { "nv!ogl_ca345840", "" }, + { "nv!ogl_cachedisable", "" }, + { "nv!ogl_channelpriorityoverride", "" }, + { "nv!ogl_cleardatastorevidmem", "" }, + { "nv!ogl_cmdbufmemoryspaceenables", "" }, + { "nv!ogl_cmdbufminwords", "" }, + { "nv!ogl_cmdbufsizewords", "" }, + { "nv!ogl_conformantblitframebufferscissor", "" }, + { "nv!ogl_conformantincompletetextures", "" }, + { "nv!ogl_copybuffermethod", "" }, + { "nv!ogl_cubemapaniso", "" }, + { "nv!ogl_cubemapfiltering", "" }, + { "nv!ogl_d0e9a4d7", "" }, + { "nv!ogl_d13733f12", "" }, + { "nv!ogl_d1b399", "" }, + { "nv!ogl_d2983c32", "" }, + { "nv!ogl_d2983c33", "" }, + { "nv!ogl_d2e71b", "" }, + { "nv!ogl_d377dc", "" }, + { "nv!ogl_d377dd", "" }, + { "nv!ogl_d489f4", "" }, + { "nv!ogl_d4bce1", "" }, + { "nv!ogl_d518cb", "" }, + { "nv!ogl_d518cd", "" }, + { "nv!ogl_d518ce", "" }, + { "nv!ogl_d518d0", "" }, + { "nv!ogl_d518d1", "" }, + { "nv!ogl_d518d2", "" }, + { "nv!ogl_d518d3", "" }, + { "nv!ogl_d518d4", "" }, + { "nv!ogl_d518d5", "" }, + { "nv!ogl_d59eda", "" }, + { "nv!ogl_d83cbd", "" }, + { "nv!ogl_d8e777", "" }, + { "nv!ogl_debug_level", "" }, + { "nv!ogl_debug_mask", "" }, + { "nv!ogl_debug_options", "" }, + { "nv!ogl_devshmpageableallocations", "" }, + { "nv!ogl_df1f9812", "" }, + { "nv!ogl_df783c", "" }, + { "nv!ogl_diagenable", "" }, + { "nv!ogl_disallowcemask", "" }, + { "nv!ogl_disallowz16", "" }, + { "nv!ogl_dlmemoryspaceenables", "" }, + { "nv!ogl_e0bfec", "" }, + { "nv!ogl_e433456d", "" }, + { "nv!ogl_e435563f", "" }, + { "nv!ogl_e4cd9c", "" }, + { "nv!ogl_e5c972", "" }, + { "nv!ogl_e639ef", "" }, + { "nv!ogl_e802af", "" }, + { "nv!ogl_eae964", "" }, + { "nv!ogl_earlytexturehwallocation", "" }, + { "nv!ogl_eb92a3", "" }, + { "nv!ogl_ebca56", "" }, + { "nv!ogl_expert_detail_level", "" }, + { "nv!ogl_expert_output_mask", "" }, + { "nv!ogl_expert_report_mask", "" }, + { "nv!ogl_extensionstringnvarch", "" }, + { "nv!ogl_extensionstringversion", "" }, + { "nv!ogl_f00f1938", "" }, + { "nv!ogl_f10736", "" }, + { "nv!ogl_f1846870", "" }, + { "nv!ogl_f33bc370", "" }, + { "nv!ogl_f392a874", "" }, + { "nv!ogl_f49ae8", "" }, + { "nv!ogl_fa345cce", "" }, + { "nv!ogl_fa35cc4", "" }, + { "nv!ogl_faa14a", "" }, + { "nv!ogl_faf8a723", "" }, + { "nv!ogl_fastgs", "" }, + { "nv!ogl_fbf4ac45", "" }, + { "nv!ogl_fbo_blit_ignore_srgb", "" }, + { "nv!ogl_fc64c7", "" }, + { "nv!ogl_ff54ec97", "" }, + { "nv!ogl_ff54ec98", "" }, + { "nv!ogl_forceexitprocessdetach", "" }, + { "nv!ogl_forcerequestedesversion", "" }, + { "nv!ogl_glsynctovblank", "" }, + { "nv!ogl_gvitimeoutcontrol", "" }, + { "nv!ogl_hcctrl", "" }, + { "nv!ogl_hwstate_per_ctx", "" }, + { "nv!ogl_machinecachelimit", "" }, + { "nv!ogl_maxframesallowed", "" }, + { "nv!ogl_memmgrcachedalloclimit", "" }, + { "nv!ogl_memmgrcachedalloclimitratio", "" }, + { "nv!ogl_memmgrsysheapalloclimit", "" }, + { "nv!ogl_memmgrsysheapalloclimitratio", "" }, + { "nv!ogl_memmgrvidheapalloclimit", "" }, + { "nv!ogl_mosaic_clip_to_subdev", "" }, + { "nv!ogl_mosaic_clip_to_subdev_h_overlap", "" }, + { "nv!ogl_mosaic_clip_to_subdev_v_overlap", "" }, + { "nv!ogl_overlaymergeblittimerms", "" }, + { "nv!ogl_perfmon_mode", "" }, + { "nv!ogl_pixbar_mode", "" }, + { "nv!ogl_qualityenhancements", "" }, + { "nv!ogl_r27s18q28", "" }, + { "nv!ogl_r2d7c1d8", "" }, + { "nv!ogl_renderer", "" }, + { "nv!ogl_renderqualityflags", "" }, + { "nv!ogl_s3tcquality", "" }, + { "nv!ogl_shaderatomics", "" }, + { "nv!ogl_shadercacheinitsize", "" }, + { "nv!ogl_shader_disk_cache_path", "" }, + { "nv!ogl_shader_disk_cache_read_only", "" }, + { "nv!ogl_shaderobjects", "" }, + { "nv!ogl_shaderportabilitywarnings", "" }, + { "nv!ogl_shaderwarningsaserrors", "" }, + { "nv!ogl_skiptexturehostcopies", "" }, + { "nv!ogl_sli_dli_control", "" }, + { "nv!ogl_sparsetexture", "" }, + { "nv!ogl_spinlooptimeout", "" }, + { "nv!ogl_sync_to_vblank", "" }, + { "nv!ogl_sysheapreuseratio", "" }, + { "nv!ogl_sysmemtexturepromotion", "" }, + { "nv!ogl_targetflushcount", "" }, + { "nv!ogl_tearingfreeswappresent", "" }, + { "nv!ogl_texclampbehavior", "" }, + { "nv!ogl_texlodbias", "" }, + { "nv!ogl_texmemoryspaceenables", "" }, + { "nv!ogl_textureprecache", "" }, + { "nv!ogl_threadcontrol", "" }, + { "nv!ogl_threadcontrol2", "" }, + { "nv!ogl_usegvievents", "" }, + { "nv!ogl_vbomemoryspaceenables", "" }, + { "nv!ogl_vertexlimit", "" }, + { "nv!ogl_vidheapreuseratio", "" }, + { "nv!ogl_vpipe", "" }, + { "nv!ogl_vpipeformatbloatlimit", "" }, + { "nv!ogl_wglmessageboxonabort", "" }, + { "nv!ogl_writeinfolog", "" }, + { "nv!ogl_writeprogramobjectassembly", "" }, + { "nv!ogl_writeprogramobjectsource", "" }, + { "nv!ogl_xnvadapterpresent", "" }, + { "nv!ogl_yield", "" }, + { "nv!ogl_yieldfunction", "" }, + { "nv!ogl_yieldfunctionfast", "" }, + { "nv!ogl_yieldfunctionslow", "" }, + { "nv!ogl_yieldfunctionwaitfordcqueue", "" }, + { "nv!ogl_yieldfunctionwaitforframe", "" }, + { "nv!ogl_yieldfunctionwaitforgpu", "" }, + { "nv!ogl_zbctableaddhysteresis", "" }, + { "nv!overlaymergeblittimerms", "" }, + { "nv!perfmon_mode", "" }, + { "nv!persist.sys.display.resolution", "" }, + { "nv!persist.tegra.composite.fallb", "" }, + { "nv!persist.tegra.composite.policy", "" }, + { "nv!persist.tegra.composite.range", "" }, + { "nv!persist.tegra.compositor", "" }, + { "nv!persist.tegra.compositor.virt", "" }, + { "nv!persist.tegra.compression", "" }, + { "nv!persist.tegra.cursor.enable", "" }, + { "nv!persist.tegra.didim.enable", "" }, + { "nv!persist.tegra.didim.normal", "" }, + { "nv!persist.tegra.didim.video", "" }, + { "nv!persist.tegra.disp.heads", "" }, + { "nv!persist.tegra.gamma_correction", "" }, + { "nv!persist.tegra.gpu_mapping_cache", "" }, + { "nv!persist.tegra.grlayout", "" }, + { "nv!persist.tegra.hdmi.2020.10", "" }, + { "nv!persist.tegra.hdmi.2020.fake", "" }, + { "nv!persist.tegra.hdmi.2020.force", "" }, + { "nv!persist.tegra.hdmi.autorotate", "" }, + { "nv!persist.tegra.hdmi.hdr.fake", "" }, + { "nv!persist.tegra.hdmi.ignore_ratio", "" }, + { "nv!persist.tegra.hdmi.limit.clock", "" }, + { "nv!persist.tegra.hdmi.only_16_9", "" }, + { "nv!persist.tegra.hdmi.range", "" }, + { "nv!persist.tegra.hdmi.resolution", "" }, + { "nv!persist.tegra.hdmi.underscan", "" }, + { "nv!persist.tegra.hdmi.yuv.422", "" }, + { "nv!persist.tegra.hdmi.yuv.444", "" }, + { "nv!persist.tegra.hdmi.yuv.enable", "" }, + { "nv!persist.tegra.hdmi.yuv.force", "" }, + { "nv!persist.tegra.hwc.nvdc", "" }, + { "nv!persist.tegra.idle.minimum_fps", "" }, + { "nv!persist.tegra.panel.rotation", "" }, + { "nv!persist.tegra.scan_props", "" }, + { "nv!persist.tegra.stb.mode", "" }, + { "nv!persist.tegra.zbc_override", "" }, + { "nv!pixbar_mode", "" }, + { "nv!qualityenhancements", "" }, + { "nv!r27s18q28", "" }, + { "nv!r2d7c1d8", "" }, + { "nv!renderer", "" }, + { "nv!renderqualityflags", "" }, + { "nv!rmos_debug_mask", "" }, + { "nv!rmos_set_production_mode", "" }, + { "nv!s3tcquality", "" }, + { "nv!shaderatomics", "" }, + { "nv!shadercacheinitsize", "" }, + { "nv!shader_disk_cache_path", "" }, + { "nv!shader_disk_cache_read_only", "" }, + { "nv!shaderobjects", "" }, + { "nv!shaderportabilitywarnings", "" }, + { "nv!shaderwarningsaserrors", "" }, + { "nv!skiptexturehostcopies", "" }, + { "nv!sli_dli_control", "" }, + { "nv!sparsetexture", "" }, + { "nv!spinlooptimeout", "" }, + { "nv!sync_to_vblank", "" }, + { "nv!sysheapreuseratio", "" }, + { "nv!sysmemtexturepromotion", "" }, + { "nv!targetflushcount", "" }, + { "nv!tearingfreeswappresent", "" }, + { "nv!tegra.refresh", "" }, + { "nv!texclampbehavior", "" }, + { "nv!texlodbias", "" }, + { "nv!texmemoryspaceenables", "" }, + { "nv!textureprecache", "" }, + { "nv!threadcontrol", "" }, + { "nv!threadcontrol2", "" }, + { "nv!tvmr.avp.logs", "" }, + { "nv!tvmr.buffer.logs", "" }, + { "nv!tvmr.dec.prof", "" }, + { "nv!tvmr.deint.logs", "" }, + { "nv!tvmr.dfs.logs", "" }, + { "nv!tvmr.ffprof.logs", "" }, + { "nv!tvmr.game.stream", "" }, + { "nv!tvmr.general.logs", "" }, + { "nv!tvmr.input.dump", "" }, + { "nv!tvmr.seeking.logs", "" }, + { "nv!tvmr.ts_pulldown", "" }, + { "nv!usegvievents", "" }, + { "nv!vbomemoryspaceenables", "" }, + { "nv!vcc_debug_ip", "" }, + { "nv!vcc_verbose_level", "" }, + { "nv!vertexlimit", "" }, + { "nv!viccomposer.filter", "" }, + { "nv!videostats-enable", "" }, + { "nv!vidheapreuseratio", "" }, + { "nv!vpipe", "" }, + { "nv!vpipeformatbloatlimit", "" }, + { "nv!wglmessageboxonabort", "" }, + { "nv!writeinfolog", "" }, + { "nv!writeprogramobjectassembly", "" }, + { "nv!writeprogramobjectsource", "" }, + { "nv!xnvadapterpresent", "" }, + { "nv!yield", "" }, + { "nv!yieldfunction", "" }, + { "nv!yieldfunctionfast", "" }, + { "nv!yieldfunctionslow", "" }, + { "nv!yieldfunctionwaitfordcqueue", "" }, + { "nv!yieldfunctionwaitforframe", "" }, + { "nv!yieldfunctionwaitforgpu", "" }, + { "nv!zbctableaddhysteresis", "" }, + { "pcm!enable", true }, + { "pctl!intermittent_task_interval_seconds", 21600 }, + { "prepo!devmenu_prepo_page_view", false }, + { "prepo!background_processing", true }, + { "prepo!transmission_interval_min", 10 }, + { "prepo!transmission_retry_interval", 3600 }, + { "psm!evaluation_log_enabled", false }, + { "snap_shot_dump!auto_dump", false }, + { "snap_shot_dump!output_dir", "%USERPROFILE%/Documents/Nintendo/NXDMP" }, + { "snap_shot_dump!full_dump", false }, + { "systemconfig!field_testing", false }, + { "systemconfig!exhivision", false }, + { "systempowerstate!always_reboot", false }, + { "systempowerstate!power_state_message_emulation_trigger_time", 0 }, + { "systempowerstate!power_state_message_to_emulate", 0 }, + { "target_manager!device_name", "" }, + { "vulnerability!needs_update_vulnerability_policy", 0 }, + { "apm!performance_mode_policy", "auto" }, + { "apm!sdev_throttling_enabled", true }, + { "apm!sdev_throttling_additional_delay_us", 16000 }, + { "apm!battery_draining_enabled", false }, + { "apm!sdev_cpu_overclock_enabled", false }, + { "bcat!production_mode", true }, + { "bpc!enable_quasi_off", true }, + { "bsp0!usb", "UDS" }, + { "bsp0!tm_transport", "USB" }, + { "bluetooth_debug!skip_boot", false }, + { "contents_delivery!enable_debug_api", false }, + { "eupld!upload_enabled", true }, + { "fatal!transition_to_fatal", true }, + { "fatal!show_extra_info", false }, + { "gpu_core_dump!auto_dump", false }, + { "hid_debug!enables_debugpad", false }, + { "hid_debug!manages_devices", true }, + { "hid_debug!emulate_future_device", false }, + { "hid_debug!emulate_firmware_update_failure", false }, + { "hid_debug!emulate_mcu_hardware_error", false }, + { "hid_debug!firmware_update_failure_emulation_mode", 0 }, + { "jit_debug!enable_jit_debug", false }, + { "npns!background_processing", true }, + { "npns!logmanager_redirection", true }, + { "npns!sleep_processing_timeout", 30 }, + { "npns!sleep_periodic_interval", 10800 }, + { "npns!sleep_max_try_count", 5 }, + { "npns!test_mode", false }, + { "ns.applet!overlay_applet_id", "0x010000000000100c" }, + { "ns.applet!system_applet_id", "0x0100000000001000" }, + { "ns.applet!shop_applet_id", "0x010000000000100b" }, + { "ns.autoboot!enabled", true }, + { "ns.pseudodeviceid!reset_pseudo_device_id", false }, + { "nsd!environment_identifier", "lp1" }, + { "nsd!test_mode", false }, + { "ntc!is_autonomic_correction_enabled", true }, + { "ntc!autonomic_correction_interval_seconds", 432000 }, + { "ntc!autonomic_correction_failed_retry_interval_seconds", 1800 }, + { "ntc!autonomic_correction_immediate_try_count_max", 4 }, + { "ntc!autonomic_correction_immediate_try_interval_milliseconds", 5000 }, + { "nv!nv_graphics_firmware_memory_margin", false }, + { "omm!operation_mode_policy", "auto" }, + { "omm!sleep_fade_in_ms", 50 }, + { "omm!sleep_fade_out_ms", 100 }, + { "omm!charging_sign_ms", 3000 }, + { "omm!low_battery_sign_ms", 3000 }, + { "omm!sign_fade_in_ms", 0 }, + { "omm!sign_fade_out_ms", 400 }, + { "omm!sign_wait_layer_visible_ms", 100 }, + { "omm!startup_fade_in_ms", 200 }, + { "omm!startup_fade_out_ms", 400 }, + { "omm!backlight_off_ms_on_handheld_switch", 150 }, + { "omm!sleep_on_ac_ok_boot", true }, + { "pdm!save_playlog", true }, + { "productinfo!product_name", "Nintendo Switch" }, + { "productinfo!cec_osd_name", "NintendoSwitch" }, + { "ro!ease_nro_restriction", false }, + { "settings_debug!is_debug_mode_enabled", false }, + { "systemreport!enabled", true }, + { "systemsleep!enter_sleep", true }, + { "systemsleep!enter_sc7", true }, + { "systemsleep!keep_vdd_core", true }, + { "systemsleep!disable_tma_sleep", false }, + { "systemsleep!disable_auto_sleep", false }, + { "systemsleep!override_auto_sleep_time", 0 }, + { "systemsleep!sleep_pending_time_ms", 15000 }, + { "systemsleep!hush_time_after_brief_power_button_press_ms", 1000 }, + { "systemsleep!transition_timeout_sec", 60 }, + { "systemsleep!dummy_event_auto_wake", false }, + { "systemupdate!debug_id", "0x0000000000000000" }, + { "systemupdate!debug_version", 0 }, + { "systemupdate!bgnup_retry_seconds", 60 }, + { "systemupdate!enable_background_download_stress_testing", false }, + { "systemupdate!debug_id_for_content_delivery", "0x0000000000000000" }, + { "systemupdate!debug_version_for_content_delivery", 0 }, + { "systemupdate!assumed_system_applet_version", 0 }, + { "tc!iir_filter_gain_soc", 100 }, + { "tc!iir_filter_gain_pcb", 100 }, + { "tc!tskin_soc_coefficients_handheld", "[5464, 174190]" }, + { "tc!tskin_soc_coefficients_console", "[6182, 112480]" }, + { "tc!tskin_pcb_coefficients_handheld", "[5464, 174190]" }, + { "tc!tskin_pcb_coefficients_console", "[6182, 112480]" }, + { "tc!tskin_select", "both" }, + { "tc!tskin_rate_table_handheld", "[[-1000000, 40000, 0, 0], [36000, 43000, 51, 51], [43000, 48000, 51, 102], [48000, 53000, 102, 153], [53000, 1000000, 153, 153], [48000, 1000000, 153, 153]]" }, + { "tc!tskin_rate_table_console", "[[-1000000, 43000, 51, 51], [43000, 53000, 51, 153], [53000, 58000, 153, 255], [58000, 1000000, 255, 255]]" }, + { "tc!rate_select", "both" }, + { "tc!log_enabled", false }, + { "tc!sleep_enabled", true }, + { "time!standard_steady_clock_test_offset_minutes", 0 }, + { "time!standard_steady_clock_rtc_update_interval_minutes", 5 }, + { "time!standard_network_clock_sufficient_accuracy_minutes", 43200 }, + { "usb!usb30_force_enabled", false }, + { "wlan_debug!skip_wlan_boot", false }, + }; + } +} diff --git a/Ryujinx.Core/OsHle/Services/Sfdnsres/IResolver.cs b/Ryujinx.HLE/OsHle/Services/Sfdnsres/IResolver.cs similarity index 84% rename from Ryujinx.Core/OsHle/Services/Sfdnsres/IResolver.cs rename to Ryujinx.HLE/OsHle/Services/Sfdnsres/IResolver.cs index e8d48ceeb..2fa81eb9b 100644 --- a/Ryujinx.Core/OsHle/Services/Sfdnsres/IResolver.cs +++ b/Ryujinx.HLE/OsHle/Services/Sfdnsres/IResolver.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Sfdnsres +namespace Ryujinx.HLE.OsHle.Services.Sfdnsres { class IResolver : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs b/Ryujinx.HLE/OsHle/Services/Sm/IUserInterface.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs rename to Ryujinx.HLE/OsHle/Services/Sm/IUserInterface.cs index f7c0f1076..a0a174f5e 100644 --- a/Ryujinx.Core/OsHle/Services/Sm/IUserInterface.cs +++ b/Ryujinx.HLE/OsHle/Services/Sm/IUserInterface.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Sm +namespace Ryujinx.HLE.OsHle.Services.Sm { class IUserInterface : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ssl/ISslService.cs b/Ryujinx.HLE/OsHle/Services/Ssl/ISslService.cs similarity index 87% rename from Ryujinx.Core/OsHle/Services/Ssl/ISslService.cs rename to Ryujinx.HLE/OsHle/Services/Ssl/ISslService.cs index 3dab45154..0bf4c1446 100644 --- a/Ryujinx.Core/OsHle/Services/Ssl/ISslService.cs +++ b/Ryujinx.HLE/OsHle/Services/Ssl/ISslService.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Ssl +namespace Ryujinx.HLE.OsHle.Services.Ssl { class ISslService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/IStaticService.cs b/Ryujinx.HLE/OsHle/Services/Time/IStaticService.cs similarity index 95% rename from Ryujinx.Core/OsHle/Services/Time/IStaticService.cs rename to Ryujinx.HLE/OsHle/Services/Time/IStaticService.cs index 94d9ae741..1f0121446 100644 --- a/Ryujinx.Core/OsHle/Services/Time/IStaticService.cs +++ b/Ryujinx.HLE/OsHle/Services/Time/IStaticService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Time +namespace Ryujinx.HLE.OsHle.Services.Time { class IStaticService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs b/Ryujinx.HLE/OsHle/Services/Time/ISteadyClock.cs similarity index 85% rename from Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs rename to Ryujinx.HLE/OsHle/Services/Time/ISteadyClock.cs index 187d7a063..6be097b7d 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs +++ b/Ryujinx.HLE/OsHle/Services/Time/ISteadyClock.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Time +namespace Ryujinx.HLE.OsHle.Services.Time { class ISteadyClock : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs b/Ryujinx.HLE/OsHle/Services/Time/ISystemClock.cs similarity index 60% rename from Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs rename to Ryujinx.HLE/OsHle/Services/Time/ISystemClock.cs index 9cfdcc875..4075995e3 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs +++ b/Ryujinx.HLE/OsHle/Services/Time/ISystemClock.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Time +namespace Ryujinx.HLE.OsHle.Services.Time { class ISystemClock : IpcService { @@ -18,7 +18,8 @@ namespace Ryujinx.Core.OsHle.Services.Time { m_Commands = new Dictionary() { - { 0, GetCurrentTime } + { 0, GetCurrentTime }, + { 2, GetSystemClockContext } }; this.ClockType = ClockType; @@ -38,5 +39,20 @@ namespace Ryujinx.Core.OsHle.Services.Time return 0; } + + public long GetSystemClockContext(ServiceCtx Context) + { + //Raw data dumped from real switch via pegaswitch + byte[] SystemClockContext = { 0x07, 0x00, 0x19, 0x00, 0x0d, 0xd2, 0xb2, 0x80}; + + Array.Resize(ref SystemClockContext, 0x20); + + for (int Index = 0; Index < 0x20; Index++) + { + Context.ResponseData.Write(SystemClockContext[Index]); + } + + return 0; + } } -} \ No newline at end of file +} diff --git a/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs b/Ryujinx.HLE/OsHle/Services/Time/ITimeZoneService.cs similarity index 96% rename from Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs rename to Ryujinx.HLE/OsHle/Services/Time/ITimeZoneService.cs index c9c2c94a6..39454d433 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs +++ b/Ryujinx.HLE/OsHle/Services/Time/ITimeZoneService.cs @@ -1,9 +1,9 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Time +namespace Ryujinx.HLE.OsHle.Services.Time { class ITimeZoneService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs b/Ryujinx.HLE/OsHle/Services/Time/SystemClockType.cs similarity index 66% rename from Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs rename to Ryujinx.HLE/OsHle/Services/Time/SystemClockType.cs index 7b5074ba7..518e1eb0c 100644 --- a/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs +++ b/Ryujinx.HLE/OsHle/Services/Time/SystemClockType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Time +namespace Ryujinx.HLE.OsHle.Services.Time { enum SystemClockType { diff --git a/Ryujinx.Core/OsHle/Services/Vi/Display.cs b/Ryujinx.HLE/OsHle/Services/Vi/Display.cs similarity index 80% rename from Ryujinx.Core/OsHle/Services/Vi/Display.cs rename to Ryujinx.HLE/OsHle/Services/Vi/Display.cs index 0dbb2eda0..3da51c478 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/Display.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/Display.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class Display { diff --git a/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs b/Ryujinx.HLE/OsHle/Services/Vi/GbpBuffer.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs rename to Ryujinx.HLE/OsHle/Services/Vi/GbpBuffer.cs index cae310544..b9e9054ba 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/GbpBuffer.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.Services.Android +namespace Ryujinx.HLE.OsHle.Services.Android { struct GbpBuffer { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs b/Ryujinx.HLE/OsHle/Services/Vi/IApplicationDisplayService.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/IApplicationDisplayService.cs index 84f7b086f..57848319f 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/IApplicationDisplayService.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; using System.IO; -using static Ryujinx.Core.OsHle.Services.Android.Parcel; +using static Ryujinx.HLE.OsHle.Services.Android.Parcel; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class IApplicationDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IApplicationRootService.cs b/Ryujinx.HLE/OsHle/Services/Vi/IApplicationRootService.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Vi/IApplicationRootService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/IApplicationRootService.cs index d92b2d9d3..93b05156d 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IApplicationRootService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/IApplicationRootService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class IApplicationRootService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs b/Ryujinx.HLE/OsHle/Services/Vi/IHOSBinderDriver.cs similarity index 94% rename from Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs rename to Ryujinx.HLE/OsHle/Services/Vi/IHOSBinderDriver.cs index 23746613b..85283b75c 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/IHOSBinderDriver.cs @@ -1,11 +1,11 @@ -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.Services.Android; using Ryujinx.Graphics.Gal; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Services.Android; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class IHOSBinderDriver : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs b/Ryujinx.HLE/OsHle/Services/Vi/IManagerDisplayService.cs similarity index 93% rename from Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/IManagerDisplayService.cs index b0bb96e07..d7a51b0e8 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/IManagerDisplayService.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -using Ryujinx.Core.Logging; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class IManagerDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IManagerRootService.cs b/Ryujinx.HLE/OsHle/Services/Vi/IManagerRootService.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Vi/IManagerRootService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/IManagerRootService.cs index 177e5e666..7c131dac8 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IManagerRootService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/IManagerRootService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class IManagerRootService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs b/Ryujinx.HLE/OsHle/Services/Vi/ISystemDisplayService.cs similarity index 92% rename from Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/ISystemDisplayService.cs index 693a02c4d..360268b9b 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/ISystemDisplayService.cs @@ -1,8 +1,8 @@ -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class ISystemDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/ISystemRootService.cs b/Ryujinx.HLE/OsHle/Services/Vi/ISystemRootService.cs similarity index 90% rename from Ryujinx.Core/OsHle/Services/Vi/ISystemRootService.cs rename to Ryujinx.HLE/OsHle/Services/Vi/ISystemRootService.cs index 47123a556..21581baa0 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/ISystemRootService.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/ISystemRootService.cs @@ -1,7 +1,7 @@ -using Ryujinx.Core.OsHle.Ipc; +using Ryujinx.HLE.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.Services.Vi +namespace Ryujinx.HLE.OsHle.Services.Vi { class ISystemRootService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs b/Ryujinx.HLE/OsHle/Services/Vi/NvFlinger.cs similarity index 98% rename from Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs rename to Ryujinx.HLE/OsHle/Services/Vi/NvFlinger.cs index b02350e03..b45dac6b3 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/NvFlinger.cs @@ -1,17 +1,16 @@ -using Ryujinx.Core.Gpu; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.Services.Nv.NvMap; using Ryujinx.Graphics.Gal; +using Ryujinx.HLE.Gpu; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle.Handles; +using Ryujinx.HLE.OsHle.Services.Nv.NvMap; using System; using System.Collections.Generic; using System.IO; using System.Text; using System.Threading; +using static Ryujinx.HLE.OsHle.Services.Android.Parcel; -using static Ryujinx.Core.OsHle.Services.Android.Parcel; - -namespace Ryujinx.Core.OsHle.Services.Android +namespace Ryujinx.HLE.OsHle.Services.Android { class NvFlinger : IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs b/Ryujinx.HLE/OsHle/Services/Vi/Parcel.cs similarity index 97% rename from Ryujinx.Core/OsHle/Services/Vi/Parcel.cs rename to Ryujinx.HLE/OsHle/Services/Vi/Parcel.cs index 1300a741d..009ed8c12 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs +++ b/Ryujinx.HLE/OsHle/Services/Vi/Parcel.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Ryujinx.Core.OsHle.Services.Android +namespace Ryujinx.HLE.OsHle.Services.Android { static class Parcel { diff --git a/Ryujinx.Core/OsHle/SystemLanguage.cs b/Ryujinx.HLE/OsHle/SystemLanguage.cs similarity index 93% rename from Ryujinx.Core/OsHle/SystemLanguage.cs rename to Ryujinx.HLE/OsHle/SystemLanguage.cs index 470362c0c..4f1908765 100644 --- a/Ryujinx.Core/OsHle/SystemLanguage.cs +++ b/Ryujinx.HLE/OsHle/SystemLanguage.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { public enum SystemLanguage { diff --git a/Ryujinx.Core/OsHle/SystemStateMgr.cs b/Ryujinx.HLE/OsHle/SystemStateMgr.cs similarity index 98% rename from Ryujinx.Core/OsHle/SystemStateMgr.cs rename to Ryujinx.HLE/OsHle/SystemStateMgr.cs index 0756c7d1f..e78082c45 100644 --- a/Ryujinx.Core/OsHle/SystemStateMgr.cs +++ b/Ryujinx.HLE/OsHle/SystemStateMgr.cs @@ -1,6 +1,6 @@ using System; -namespace Ryujinx.Core.OsHle +namespace Ryujinx.HLE.OsHle { public class SystemStateMgr { diff --git a/Ryujinx.Core/OsHle/Utilities/EndianSwap.cs b/Ryujinx.HLE/OsHle/Utilities/EndianSwap.cs similarity index 77% rename from Ryujinx.Core/OsHle/Utilities/EndianSwap.cs rename to Ryujinx.HLE/OsHle/Utilities/EndianSwap.cs index 6758f1f2f..93fd38c8f 100644 --- a/Ryujinx.Core/OsHle/Utilities/EndianSwap.cs +++ b/Ryujinx.HLE/OsHle/Utilities/EndianSwap.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Utilities +namespace Ryujinx.HLE.OsHle.Utilities { static class EndianSwap { diff --git a/Ryujinx.Core/OsHle/Utilities/IntUtils.cs b/Ryujinx.HLE/OsHle/Utilities/IntUtils.cs similarity index 88% rename from Ryujinx.Core/OsHle/Utilities/IntUtils.cs rename to Ryujinx.HLE/OsHle/Utilities/IntUtils.cs index 4a522465a..ba0726c31 100644 --- a/Ryujinx.Core/OsHle/Utilities/IntUtils.cs +++ b/Ryujinx.HLE/OsHle/Utilities/IntUtils.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.Utilities +namespace Ryujinx.HLE.OsHle.Utilities { static class IntUtils { diff --git a/Ryujinx.Core/PerformanceStatistics.cs b/Ryujinx.HLE/PerformanceStatistics.cs similarity index 99% rename from Ryujinx.Core/PerformanceStatistics.cs rename to Ryujinx.HLE/PerformanceStatistics.cs index e5d930f93..bbcdc6450 100644 --- a/Ryujinx.Core/PerformanceStatistics.cs +++ b/Ryujinx.HLE/PerformanceStatistics.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Timers; -namespace Ryujinx.Core +namespace Ryujinx.HLE { public class PerformanceStatistics { diff --git a/Ryujinx.Core/Ryujinx.Core.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj similarity index 100% rename from Ryujinx.Core/Ryujinx.Core.csproj rename to Ryujinx.HLE/Ryujinx.HLE.csproj diff --git a/Ryujinx.Core/Settings/ColorSet.cs b/Ryujinx.HLE/Settings/ColorSet.cs similarity index 73% rename from Ryujinx.Core/Settings/ColorSet.cs rename to Ryujinx.HLE/Settings/ColorSet.cs index 43483363f..77485d228 100644 --- a/Ryujinx.Core/Settings/ColorSet.cs +++ b/Ryujinx.HLE/Settings/ColorSet.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Settings +namespace Ryujinx.HLE.Settings { public enum ColorSet { diff --git a/Ryujinx.Core/Settings/SystemSettings.cs b/Ryujinx.HLE/Settings/SystemSettings.cs similarity index 72% rename from Ryujinx.Core/Settings/SystemSettings.cs rename to Ryujinx.HLE/Settings/SystemSettings.cs index 0f56ef3ae..555e83bba 100644 --- a/Ryujinx.Core/Settings/SystemSettings.cs +++ b/Ryujinx.HLE/Settings/SystemSettings.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.Settings +namespace Ryujinx.HLE.Settings { public class SystemSettings { diff --git a/Ryujinx.Core/Switch.cs b/Ryujinx.HLE/Switch.cs similarity index 92% rename from Ryujinx.Core/Switch.cs rename to Ryujinx.HLE/Switch.cs index a755ea0c7..f75b24908 100644 --- a/Ryujinx.Core/Switch.cs +++ b/Ryujinx.HLE/Switch.cs @@ -1,13 +1,13 @@ using Ryujinx.Audio; -using Ryujinx.Core.Input; -using Ryujinx.Core.Logging; -using Ryujinx.Core.OsHle; -using Ryujinx.Core.Settings; using Ryujinx.Graphics.Gal; -using Ryujinx.Core.Gpu; +using Ryujinx.HLE.Gpu; +using Ryujinx.HLE.Input; +using Ryujinx.HLE.Logging; +using Ryujinx.HLE.OsHle; +using Ryujinx.HLE.Settings; using System; -namespace Ryujinx.Core +namespace Ryujinx.HLE { public class Switch : IDisposable { diff --git a/Ryujinx.Core/VirtualFileSystem.cs b/Ryujinx.HLE/VirtualFileSystem.cs similarity index 98% rename from Ryujinx.Core/VirtualFileSystem.cs rename to Ryujinx.HLE/VirtualFileSystem.cs index 1c717b2ca..8b71caa97 100644 --- a/Ryujinx.Core/VirtualFileSystem.cs +++ b/Ryujinx.HLE/VirtualFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Ryujinx.Core +namespace Ryujinx.HLE { class VirtualFileSystem : IDisposable { diff --git a/Ryujinx.LLE/Luea.csproj b/Ryujinx.LLE/Luea.csproj new file mode 100644 index 000000000..23df6047f --- /dev/null +++ b/Ryujinx.LLE/Luea.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp2.1 + + + diff --git a/Ryujinx.LLE/Program.cs b/Ryujinx.LLE/Program.cs new file mode 100644 index 000000000..96458d1eb --- /dev/null +++ b/Ryujinx.LLE/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace Luea +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Initializing..."); + } + } +} diff --git a/Ryushader/Memory.cs b/Ryujinx.ShaderTools/Memory.cs similarity index 94% rename from Ryushader/Memory.cs rename to Ryujinx.ShaderTools/Memory.cs index ae336e72c..f801ab39a 100644 --- a/Ryushader/Memory.cs +++ b/Ryujinx.ShaderTools/Memory.cs @@ -1,7 +1,7 @@ using Ryujinx.Graphics.Gal; using System.IO; -namespace Ryushader +namespace Ryujinx.ShaderTools { class Memory : IGalMemory { diff --git a/Ryushader/Program.cs b/Ryujinx.ShaderTools/Program.cs similarity index 91% rename from Ryushader/Program.cs rename to Ryujinx.ShaderTools/Program.cs index 9444be6d3..3597f2562 100644 --- a/Ryushader/Program.cs +++ b/Ryujinx.ShaderTools/Program.cs @@ -3,7 +3,7 @@ using Ryujinx.Graphics.Gal.Shader; using System; using System.IO; -namespace Ryushader +namespace Ryujinx.ShaderTools { class Program { @@ -35,7 +35,7 @@ namespace Ryushader } else { - Console.WriteLine("Usage: Ryushader [v|tc|te|g|f] shader.bin"); + Console.WriteLine("Usage: Ryujinx.ShaderTools [v|tc|te|g|f] shader.bin"); } } } diff --git a/Ryushader/Ryushader.csproj b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj similarity index 100% rename from Ryushader/Ryushader.csproj rename to Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj diff --git a/Ryujinx.Tests/Cpu/CpuTest.cs b/Ryujinx.Tests/Cpu/CpuTest.cs index 3ff1e4a0d..493be7791 100644 --- a/Ryujinx.Tests/Cpu/CpuTest.cs +++ b/Ryujinx.Tests/Cpu/CpuTest.cs @@ -1,13 +1,11 @@ using ChocolArm64; using ChocolArm64.Memory; using ChocolArm64.State; - using NUnit.Framework; - using System; -using System.Threading; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; +using System.Threading; namespace Ryujinx.Tests.Cpu { diff --git a/Ryujinx.sln b/Ryujinx.sln index 213f73866..cd04dabc2 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "Ryujinx\Ryujinx. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Core", "Ryujinx.Core\Ryujinx.Core.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE", "Ryujinx.HLE\Ryujinx.HLE.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChocolArm64", "ChocolArm64\ChocolArm64.csproj", "{2345A1A7-8DEF-419B-9AFB-4DFD41D20D05}" EndProject @@ -15,7 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics", "Ryujinx EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "Ryujinx.Audio\Ryujinx.Audio.csproj", "{5C1D818E-682A-46A5-9D54-30006E26C270}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryushader", "Ryushader\Ryushader.csproj", "{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.ShaderTools", "Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj", "{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luea", "Ryujinx.LLE\Luea.csproj", "{8E7D36DD-9626-47E2-8EF5-8F2F66751C9C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,6 +53,10 @@ Global {3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.Build.0 = Release|Any CPU + {8E7D36DD-9626-47E2-8EF5-8F2F66751C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E7D36DD-9626-47E2-8EF5-8F2F66751C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E7D36DD-9626-47E2-8EF5-8F2F66751C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E7D36DD-9626-47E2-8EF5-8F2F66751C9C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Ryujinx/Config.cs b/Ryujinx/Config.cs index 86b74c966..b437a006d 100644 --- a/Ryujinx/Config.cs +++ b/Ryujinx/Config.cs @@ -1,5 +1,5 @@ -using Ryujinx.Core.Input; -using Ryujinx.Core.Logging; +using Ryujinx.HLE.Input; +using Ryujinx.HLE.Logging; using System; using System.Collections.Generic; using System.IO; diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index dc6203d52..47076737b 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -12,7 +12,7 @@ - + diff --git a/Ryujinx/Ui/ConsoleLog.cs b/Ryujinx/Ui/ConsoleLog.cs index b9707357b..1a2899946 100644 --- a/Ryujinx/Ui/ConsoleLog.cs +++ b/Ryujinx/Ui/ConsoleLog.cs @@ -1,4 +1,4 @@ -using Ryujinx.Core.Logging; +using Ryujinx.HLE.Logging; using System; using System.Collections.Generic; using System.Threading; diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs index 6b6ae6a01..84ba2dd98 100644 --- a/Ryujinx/Ui/GLScreen.cs +++ b/Ryujinx/Ui/GLScreen.cs @@ -1,9 +1,9 @@ using OpenTK; using OpenTK.Graphics; using OpenTK.Input; -using Ryujinx.Core; -using Ryujinx.Core.Input; using Ryujinx.Graphics.Gal; +using Ryujinx.HLE; +using Ryujinx.HLE.Input; using System; namespace Ryujinx diff --git a/Ryujinx/Ui/Program.cs b/Ryujinx/Ui/Program.cs index 77322d087..3bb16faf2 100644 --- a/Ryujinx/Ui/Program.cs +++ b/Ryujinx/Ui/Program.cs @@ -1,8 +1,8 @@ using Ryujinx.Audio; using Ryujinx.Audio.OpenAL; -using Ryujinx.Core; using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal.OpenGL; +using Ryujinx.HLE; using System; using System.IO;