Browse Source
Merge pull request #6383 from degasus/fix_gcc_warnings
Fix two GCC 11 warnings: Unneeded copies.
pull/15/merge
Mai M
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/core/hle/kernel/kernel.cpp
-
src/video_core/buffer_cache/buffer_cache.h
|
|
|
@ -258,7 +258,7 @@ struct KernelCore::Impl { |
|
|
|
KAutoObject::Create(thread.get()); |
|
|
|
ASSERT(KThread::InitializeDummyThread(thread.get()).IsSuccess()); |
|
|
|
thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); |
|
|
|
return std::move(thread); |
|
|
|
return thread; |
|
|
|
}; |
|
|
|
|
|
|
|
thread_local auto thread = make_thread(); |
|
|
|
|
|
|
|
@ -596,7 +596,7 @@ void BufferCache<P>::PopAsyncFlushes() { |
|
|
|
runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies); |
|
|
|
} |
|
|
|
runtime.Finish(); |
|
|
|
for (const auto [copy, buffer_id] : downloads) { |
|
|
|
for (const auto& [copy, buffer_id] : downloads) { |
|
|
|
const Buffer& buffer = slot_buffers[buffer_id]; |
|
|
|
const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; |
|
|
|
// Undo the modified offset |
|
|
|
@ -606,7 +606,7 @@ void BufferCache<P>::PopAsyncFlushes() { |
|
|
|
} |
|
|
|
} else { |
|
|
|
const std::span<u8> immediate_buffer = ImmediateBuffer(largest_copy); |
|
|
|
for (const auto [copy, buffer_id] : downloads) { |
|
|
|
for (const auto& [copy, buffer_id] : downloads) { |
|
|
|
Buffer& buffer = slot_buffers[buffer_id]; |
|
|
|
buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); |
|
|
|
const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; |
|
|
|
|