From c632222c817b14d59287bf0f608658b005f0b10f Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sun, 2 Sep 2018 23:58:30 -0300 Subject: [PATCH] Remove Engines/ directory and namespace --- Ryujinx.Graphics/{Engines => }/INvGpuEngine.cs | 2 +- Ryujinx.Graphics/{Engines => }/MacroInterpreter.cs | 2 +- Ryujinx.Graphics/NvGpu.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngine.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngine2d.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngine2dReg.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngine3d.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngine3dReg.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngineDma.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuEngineDmaReg.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuFifo.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuFifoMeth.cs | 2 +- Ryujinx.Graphics/{Engines => }/NvGpuMethod.cs | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename Ryujinx.Graphics/{Engines => }/INvGpuEngine.cs (82%) rename Ryujinx.Graphics/{Engines => }/MacroInterpreter.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngine.cs (82%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngine2d.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngine2dReg.cs (95%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngine3d.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngine3dReg.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngineDma.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuEngineDmaReg.cs (93%) rename Ryujinx.Graphics/{Engines => }/NvGpuFifo.cs (99%) rename Ryujinx.Graphics/{Engines => }/NvGpuFifoMeth.cs (86%) rename Ryujinx.Graphics/{Engines => }/NvGpuMethod.cs (74%) diff --git a/Ryujinx.Graphics/Engines/INvGpuEngine.cs b/Ryujinx.Graphics/INvGpuEngine.cs similarity index 82% rename from Ryujinx.Graphics/Engines/INvGpuEngine.cs rename to Ryujinx.Graphics/INvGpuEngine.cs index 73b68937cc..810303b9f2 100644 --- a/Ryujinx.Graphics/Engines/INvGpuEngine.cs +++ b/Ryujinx.Graphics/INvGpuEngine.cs @@ -1,6 +1,6 @@ using Ryujinx.Graphics.Memory; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { interface INvGpuEngine { diff --git a/Ryujinx.Graphics/Engines/MacroInterpreter.cs b/Ryujinx.Graphics/MacroInterpreter.cs similarity index 99% rename from Ryujinx.Graphics/Engines/MacroInterpreter.cs rename to Ryujinx.Graphics/MacroInterpreter.cs index 2f81493f4a..20e7895b4a 100644 --- a/Ryujinx.Graphics/Engines/MacroInterpreter.cs +++ b/Ryujinx.Graphics/MacroInterpreter.cs @@ -2,7 +2,7 @@ using Ryujinx.Graphics.Memory; using System; using System.Collections.Generic; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { class MacroInterpreter { diff --git a/Ryujinx.Graphics/NvGpu.cs b/Ryujinx.Graphics/NvGpu.cs index 681fd8bd51..7ba700b89e 100644 --- a/Ryujinx.Graphics/NvGpu.cs +++ b/Ryujinx.Graphics/NvGpu.cs @@ -1,5 +1,5 @@ using Ryujinx.Graphics.Gal; -using Ryujinx.Graphics.Engines; +using Ryujinx.Graphics; namespace Ryujinx.Graphics { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngine.cs b/Ryujinx.Graphics/NvGpuEngine.cs similarity index 82% rename from Ryujinx.Graphics/Engines/NvGpuEngine.cs rename to Ryujinx.Graphics/NvGpuEngine.cs index 3814130449..3d5e118a59 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngine.cs +++ b/Ryujinx.Graphics/NvGpuEngine.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { enum NvGpuEngine { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngine2d.cs b/Ryujinx.Graphics/NvGpuEngine2d.cs similarity index 99% rename from Ryujinx.Graphics/Engines/NvGpuEngine2d.cs rename to Ryujinx.Graphics/NvGpuEngine2d.cs index 71c8f03379..f46472d7af 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngine2d.cs +++ b/Ryujinx.Graphics/NvGpuEngine2d.cs @@ -4,7 +4,7 @@ using Ryujinx.Graphics.Texture; using System; using System.Collections.Generic; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { public class NvGpuEngine2d : INvGpuEngine { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngine2dReg.cs b/Ryujinx.Graphics/NvGpuEngine2dReg.cs similarity index 95% rename from Ryujinx.Graphics/Engines/NvGpuEngine2dReg.cs rename to Ryujinx.Graphics/NvGpuEngine2dReg.cs index 94f4ef9088..00f6f578db 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngine2dReg.cs +++ b/Ryujinx.Graphics/NvGpuEngine2dReg.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { enum NvGpuEngine2dReg { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngine3d.cs b/Ryujinx.Graphics/NvGpuEngine3d.cs similarity index 99% rename from Ryujinx.Graphics/Engines/NvGpuEngine3d.cs rename to Ryujinx.Graphics/NvGpuEngine3d.cs index e49c26d948..40c59dfe6b 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngine3d.cs +++ b/Ryujinx.Graphics/NvGpuEngine3d.cs @@ -4,7 +4,7 @@ using Ryujinx.Graphics.Texture; using System; using System.Collections.Generic; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { public class NvGpuEngine3d : INvGpuEngine { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngine3dReg.cs b/Ryujinx.Graphics/NvGpuEngine3dReg.cs similarity index 99% rename from Ryujinx.Graphics/Engines/NvGpuEngine3dReg.cs rename to Ryujinx.Graphics/NvGpuEngine3dReg.cs index a604944120..f96e711500 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngine3dReg.cs +++ b/Ryujinx.Graphics/NvGpuEngine3dReg.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { enum NvGpuEngine3dReg { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngineDma.cs b/Ryujinx.Graphics/NvGpuEngineDma.cs similarity index 99% rename from Ryujinx.Graphics/Engines/NvGpuEngineDma.cs rename to Ryujinx.Graphics/NvGpuEngineDma.cs index 82aab6412c..04be742f85 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngineDma.cs +++ b/Ryujinx.Graphics/NvGpuEngineDma.cs @@ -2,7 +2,7 @@ using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Texture; using System.Collections.Generic; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { public class NvGpuEngineDma : INvGpuEngine { diff --git a/Ryujinx.Graphics/Engines/NvGpuEngineDmaReg.cs b/Ryujinx.Graphics/NvGpuEngineDmaReg.cs similarity index 93% rename from Ryujinx.Graphics/Engines/NvGpuEngineDmaReg.cs rename to Ryujinx.Graphics/NvGpuEngineDmaReg.cs index 8aae542717..b0fa1fbf37 100644 --- a/Ryujinx.Graphics/Engines/NvGpuEngineDmaReg.cs +++ b/Ryujinx.Graphics/NvGpuEngineDmaReg.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { enum NvGpuEngineDmaReg { diff --git a/Ryujinx.Graphics/Engines/NvGpuFifo.cs b/Ryujinx.Graphics/NvGpuFifo.cs similarity index 99% rename from Ryujinx.Graphics/Engines/NvGpuFifo.cs rename to Ryujinx.Graphics/NvGpuFifo.cs index cab4eea8a7..3b79a055e4 100644 --- a/Ryujinx.Graphics/Engines/NvGpuFifo.cs +++ b/Ryujinx.Graphics/NvGpuFifo.cs @@ -2,7 +2,7 @@ using Ryujinx.Graphics.Memory; using System.Collections.Concurrent; using System.Threading; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { public class NvGpuFifo { diff --git a/Ryujinx.Graphics/Engines/NvGpuFifoMeth.cs b/Ryujinx.Graphics/NvGpuFifoMeth.cs similarity index 86% rename from Ryujinx.Graphics/Engines/NvGpuFifoMeth.cs rename to Ryujinx.Graphics/NvGpuFifoMeth.cs index 0f761aa358..c5cb6e9421 100644 --- a/Ryujinx.Graphics/Engines/NvGpuFifoMeth.cs +++ b/Ryujinx.Graphics/NvGpuFifoMeth.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { enum NvGpuFifoMeth { diff --git a/Ryujinx.Graphics/Engines/NvGpuMethod.cs b/Ryujinx.Graphics/NvGpuMethod.cs similarity index 74% rename from Ryujinx.Graphics/Engines/NvGpuMethod.cs rename to Ryujinx.Graphics/NvGpuMethod.cs index c4a22aa004..5babf2c32f 100644 --- a/Ryujinx.Graphics/Engines/NvGpuMethod.cs +++ b/Ryujinx.Graphics/NvGpuMethod.cs @@ -1,6 +1,6 @@ using Ryujinx.Graphics.Memory; -namespace Ryujinx.Graphics.Engines +namespace Ryujinx.Graphics { delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry); } \ No newline at end of file