diff options
| author | 2019-02-12 19:26:37 -0500 | |
|---|---|---|
| committer | 2019-02-12 19:26:37 -0500 | |
| commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
| tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/video_core/gpu.cpp | |
| parent | Merge pull request #2104 from ReinUsesLisp/compute-assert (diff) | |
| parent | core_timing: Rename CoreTiming namespace to Core::Timing (diff) | |
| download | yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip | |
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/video_core/gpu.cpp')
| -rw-r--r-- | src/video_core/gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 96c42b8a0..018363f95 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp | |||
| @@ -282,7 +282,7 @@ void GPU::ProcessSemaphoreTriggerMethod() { | |||
| 282 | block.sequence = regs.semaphore_sequence; | 282 | block.sequence = regs.semaphore_sequence; |
| 283 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of | 283 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of |
| 284 | // CoreTiming | 284 | // CoreTiming |
| 285 | block.timestamp = CoreTiming::GetTicks(); | 285 | block.timestamp = Core::Timing::GetTicks(); |
| 286 | Memory::WriteBlock(*address, &block, sizeof(block)); | 286 | Memory::WriteBlock(*address, &block, sizeof(block)); |
| 287 | } else { | 287 | } else { |
| 288 | const auto address = | 288 | const auto address = |