summaryrefslogtreecommitdiff
path: root/src/video_core/engines
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-12 19:26:37 -0500
committerGravatar GitHub2019-02-12 19:26:37 -0500
commit8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch)
tree83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/video_core/engines
parentMerge pull request #2104 from ReinUsesLisp/compute-assert (diff)
parentcore_timing: Rename CoreTiming namespace to Core::Timing (diff)
downloadyuzu-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/engines')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 10eae6a65..19b6b14b2 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -317,7 +317,7 @@ void Maxwell3D::ProcessQueryGet() {
317 LongQueryResult query_result{}; 317 LongQueryResult query_result{};
318 query_result.value = result; 318 query_result.value = result;
319 // TODO(Subv): Generate a real GPU timestamp and write it here instead of CoreTiming 319 // TODO(Subv): Generate a real GPU timestamp and write it here instead of CoreTiming
320 query_result.timestamp = CoreTiming::GetTicks(); 320 query_result.timestamp = Core::Timing::GetTicks();
321 Memory::WriteBlock(*address, &query_result, sizeof(query_result)); 321 Memory::WriteBlock(*address, &query_result, sizeof(query_result));
322 } 322 }
323 dirty_flags.OnMemoryWrite(); 323 dirty_flags.OnMemoryWrite();