diff options
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 8b55df82e..7ca2a2ef1 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -258,7 +258,7 @@ struct KernelCore::Impl { | |||
| 258 | KAutoObject::Create(thread.get()); | 258 | KAutoObject::Create(thread.get()); |
| 259 | ASSERT(KThread::InitializeDummyThread(thread.get()).IsSuccess()); | 259 | ASSERT(KThread::InitializeDummyThread(thread.get()).IsSuccess()); |
| 260 | thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); | 260 | thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); |
| 261 | return std::move(thread); | 261 | return thread; |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | thread_local auto thread = make_thread(); | 264 | thread_local auto thread = make_thread(); |
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index de971041f..9e6b87960 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h | |||
| @@ -596,7 +596,7 @@ void BufferCache<P>::PopAsyncFlushes() { | |||
| 596 | runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies); | 596 | runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies); |
| 597 | } | 597 | } |
| 598 | runtime.Finish(); | 598 | runtime.Finish(); |
| 599 | for (const auto [copy, buffer_id] : downloads) { | 599 | for (const auto& [copy, buffer_id] : downloads) { |
| 600 | const Buffer& buffer = slot_buffers[buffer_id]; | 600 | const Buffer& buffer = slot_buffers[buffer_id]; |
| 601 | const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; | 601 | const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; |
| 602 | // Undo the modified offset | 602 | // Undo the modified offset |
| @@ -606,7 +606,7 @@ void BufferCache<P>::PopAsyncFlushes() { | |||
| 606 | } | 606 | } |
| 607 | } else { | 607 | } else { |
| 608 | const std::span<u8> immediate_buffer = ImmediateBuffer(largest_copy); | 608 | const std::span<u8> immediate_buffer = ImmediateBuffer(largest_copy); |
| 609 | for (const auto [copy, buffer_id] : downloads) { | 609 | for (const auto& [copy, buffer_id] : downloads) { |
| 610 | Buffer& buffer = slot_buffers[buffer_id]; | 610 | Buffer& buffer = slot_buffers[buffer_id]; |
| 611 | buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); | 611 | buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); |
| 612 | const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; | 612 | const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; |