diff options
| author | emmauss <emmausssss@gmail.com> | 2020-02-06 11:25:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 11:25:47 +0000 |
| commit | f2b9a9c2b0a3d7af3b56df9ae09db8a3b2d8506c (patch) | |
| tree | 7c4a0019c1c904397927567a0ad0685299cce1eb /Ryujinx.HLE | |
| parent | db9f8f999f2c9a50e25685424271735ed3538539 (diff) | |
Render Profiler in GUI (#854)
* move profiler output to gui
* addressed commits, rebased
* removed whitespaces
Diffstat (limited to 'Ryujinx.HLE')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/IpcService.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/PerformanceStatistics.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/Ryujinx.HLE.csproj | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/Services/IpcService.cs b/Ryujinx.HLE/HOS/Services/IpcService.cs index e9538683..67df453e 100644 --- a/Ryujinx.HLE/HOS/Services/IpcService.cs +++ b/Ryujinx.HLE/HOS/Services/IpcService.cs @@ -6,7 +6,7 @@ using Ryujinx.HLE.HOS.Kernel.Ipc; using System; using System.Collections.Generic; using System.IO; -using Ryujinx.Profiler; +using Ryujinx.Debugger.Profiler; using System.Reflection; using System.Linq; diff --git a/Ryujinx.HLE/PerformanceStatistics.cs b/Ryujinx.HLE/PerformanceStatistics.cs index 896ab67b..5abf2628 100644 --- a/Ryujinx.HLE/PerformanceStatistics.cs +++ b/Ryujinx.HLE/PerformanceStatistics.cs @@ -1,4 +1,4 @@ -using Ryujinx.Profiler; +using Ryujinx.Debugger.Profiler; using System.Diagnostics; using System.Timers; diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index ac4b8224..e9540ab8 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -12,7 +12,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile Debug|AnyCPU'"> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants>TRACE;USE_PROFILING</DefineConstants> + <DefineConstants>TRACE;USE_DEBUGGING</DefineConstants> <Optimize>false</Optimize> </PropertyGroup> @@ -22,7 +22,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile Release|AnyCPU'"> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants>TRACE;USE_PROFILING</DefineConstants> + <DefineConstants>TRACE;USE_DEBUGGING</DefineConstants> <Optimize>true</Optimize> </PropertyGroup> @@ -44,7 +44,7 @@ <ItemGroup> <ProjectReference Include="..\Ryujinx.Audio\Ryujinx.Audio.csproj" /> <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" /> - <ProjectReference Include="..\Ryujinx.Profiler\Ryujinx.Profiler.csproj" /> + <ProjectReference Include="..\Ryujinx.Debugger\Ryujinx.Debugger.csproj" /> <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" /> <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" /> <ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" /> |