diff options
| author | 2019-02-15 19:52:11 -0700 | |
|---|---|---|
| committer | 2019-02-15 19:52:11 -0700 | |
| commit | 99da6362c43a24c608a2790f668f10a62e3b80a6 (patch) | |
| tree | 6257ac07283ebb4ea5ac622784cc7a041d48f8b1 /src/video_core/gpu.cpp | |
| parent | Merge pull request #2112 from lioncash/shadowing (diff) | |
| parent | core_timing: Convert core timing into a class (diff) | |
| download | yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.gz yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.xz yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.zip | |
Merge pull request #2123 from lioncash/coretiming-global
core_timing: De-globalize core_timing facilities
Diffstat (limited to 'src/video_core/gpu.cpp')
| -rw-r--r-- | src/video_core/gpu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 3d00c308b..b86265dfe 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/assert.h" | 5 | #include "common/assert.h" |
| 6 | #include "core/core.h" | ||
| 6 | #include "core/core_timing.h" | 7 | #include "core/core_timing.h" |
| 7 | #include "core/memory.h" | 8 | #include "core/memory.h" |
| 8 | #include "video_core/engines/fermi_2d.h" | 9 | #include "video_core/engines/fermi_2d.h" |
| @@ -283,7 +284,7 @@ void GPU::ProcessSemaphoreTriggerMethod() { | |||
| 283 | block.sequence = regs.semaphore_sequence; | 284 | block.sequence = regs.semaphore_sequence; |
| 284 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of | 285 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of |
| 285 | // CoreTiming | 286 | // CoreTiming |
| 286 | block.timestamp = Core::Timing::GetTicks(); | 287 | block.timestamp = Core::System::GetInstance().CoreTiming().GetTicks(); |
| 287 | Memory::WriteBlock(*address, &block, sizeof(block)); | 288 | Memory::WriteBlock(*address, &block, sizeof(block)); |
| 288 | } else { | 289 | } else { |
| 289 | const auto address = | 290 | const auto address = |