diff options
| author | 2020-07-02 23:30:08 -0400 | |
|---|---|---|
| committer | 2020-07-02 23:30:08 -0400 | |
| commit | 41a333321af32627c0ecf6eadfa61df63c734b56 (patch) | |
| tree | d83078b19ea83c2824edf013acfa5c4df8062c56 /src/video_core/buffer_cache | |
| parent | Merge pull request #3924 from ogniK5377/GetKeyCodeMap (diff) | |
| parent | gl_buffer_cache: Copy to buffers created as STREAM_READ before downloading (diff) | |
| download | yuzu-41a333321af32627c0ecf6eadfa61df63c734b56.tar.gz yuzu-41a333321af32627c0ecf6eadfa61df63c734b56.tar.xz yuzu-41a333321af32627c0ecf6eadfa61df63c734b56.zip | |
Merge pull request #4175 from ReinUsesLisp/read-buffer
gl_buffer_cache: Copy to buffers created as STREAM_READ before downloading
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index cf8bdd021..c6479af9f 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h | |||
| @@ -322,8 +322,7 @@ protected: | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | private: | 324 | private: |
| 325 | MapInterval* MapAddress(const Buffer* block, GPUVAddr gpu_addr, VAddr cpu_addr, | 325 | MapInterval* MapAddress(Buffer* block, GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size) { |
| 326 | std::size_t size) { | ||
| 327 | const VectorMapInterval overlaps = GetMapsInRange(cpu_addr, size); | 326 | const VectorMapInterval overlaps = GetMapsInRange(cpu_addr, size); |
| 328 | if (overlaps.empty()) { | 327 | if (overlaps.empty()) { |
| 329 | auto& memory_manager = system.GPU().MemoryManager(); | 328 | auto& memory_manager = system.GPU().MemoryManager(); |
| @@ -377,8 +376,7 @@ private: | |||
| 377 | return map; | 376 | return map; |
| 378 | } | 377 | } |
| 379 | 378 | ||
| 380 | void UpdateBlock(const Buffer* block, VAddr start, VAddr end, | 379 | void UpdateBlock(Buffer* block, VAddr start, VAddr end, const VectorMapInterval& overlaps) { |
| 381 | const VectorMapInterval& overlaps) { | ||
| 382 | const IntervalType base_interval{start, end}; | 380 | const IntervalType base_interval{start, end}; |
| 383 | IntervalSet interval_set{}; | 381 | IntervalSet interval_set{}; |
| 384 | interval_set.add(base_interval); | 382 | interval_set.add(base_interval); |