summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/buffer_cache/buffer_cache.h7
-rw-r--r--src/video_core/renderer_opengl/gl_buffer_cache.cpp3
2 files changed, 4 insertions, 6 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 7bfd57369..d350c9b36 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -570,13 +570,12 @@ bool BufferCache<P>::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am
570 ForEachWrittenRange(*cpu_src_address, amount, mirror); 570 ForEachWrittenRange(*cpu_src_address, amount, mirror);
571 // This subtraction in this order is important for overlapping copies. 571 // This subtraction in this order is important for overlapping copies.
572 common_ranges.subtract(subtract_interval); 572 common_ranges.subtract(subtract_interval);
573 bool atleast_1_download = tmp_intervals.size() != 0; 573 const bool has_new_downloads = tmp_intervals.size() != 0;
574 for (const IntervalType add_interval : tmp_intervals) { 574 for (const IntervalType& add_interval : tmp_intervals) {
575 common_ranges.add(add_interval); 575 common_ranges.add(add_interval);
576 } 576 }
577
578 runtime.CopyBuffer(dest_buffer, src_buffer, copies); 577 runtime.CopyBuffer(dest_buffer, src_buffer, copies);
579 if (atleast_1_download) { 578 if (has_new_downloads) {
580 dest_buffer.MarkRegionAsGpuModified(*cpu_dest_address, amount); 579 dest_buffer.MarkRegionAsGpuModified(*cpu_dest_address, amount);
581 } 580 }
582 std::vector<u8> tmp_buffer(amount); 581 std::vector<u8> tmp_buffer(amount);
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cpp
index 07a995f7d..187a28e4d 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.cpp
@@ -147,8 +147,7 @@ void BufferCacheRuntime::CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer,
147 147
148void BufferCacheRuntime::ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value) { 148void BufferCacheRuntime::ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value) {
149 glClearNamedBufferSubData(dest_buffer.Handle(), GL_R32UI, static_cast<GLintptr>(offset), 149 glClearNamedBufferSubData(dest_buffer.Handle(), GL_R32UI, static_cast<GLintptr>(offset),
150 static_cast<GLsizeiptr>(size / sizeof(u32)), GL_RED, GL_UNSIGNED_INT, 150 static_cast<GLsizeiptr>(size), GL_RED, GL_UNSIGNED_INT, &value);
151 &value);
152} 151}
153 152
154void BufferCacheRuntime::BindIndexBuffer(Buffer& buffer, u32 offset, u32 size) { 153void BufferCacheRuntime::BindIndexBuffer(Buffer& buffer, u32 offset, u32 size) {