diff options
| author | 2021-05-29 03:08:11 -0400 | |
|---|---|---|
| committer | 2021-05-29 03:08:11 -0400 | |
| commit | 38dbe577972ed96133fab44f0f5d9a961fd7e1f7 (patch) | |
| tree | c100df6aa459de10b6162ae8d446d26e9623d2ef /src/video_core/buffer_cache | |
| parent | Merge pull request #6371 from degasus/drop_ExceptionalExit (diff) | |
| parent | Fix two GCC 11 warnings: Unneeded copies. (diff) | |
| download | yuzu-38dbe577972ed96133fab44f0f5d9a961fd7e1f7.tar.gz yuzu-38dbe577972ed96133fab44f0f5d9a961fd7e1f7.tar.xz yuzu-38dbe577972ed96133fab44f0f5d9a961fd7e1f7.zip | |
Merge pull request #6383 from degasus/fix_gcc_warnings
Fix two GCC 11 warnings: Unneeded copies.
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |