diff options
| author | 2019-08-30 15:08:00 -0300 | |
|---|---|---|
| committer | 2019-08-30 14:08:00 -0400 | |
| commit | 4d4f9cc104c9440de36e3ff3f6b374acd8074885 (patch) | |
| tree | ec9d52b39ac1da86866b5d6c5b592d8ddb324efd /src/video_core/buffer_cache | |
| parent | Merge pull request #2819 from ReinUsesLisp/fixup-clang (diff) | |
| download | yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.gz yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.xz yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.zip | |
video_core: Silent miscellaneous warnings (#2820)
* texture_cache/surface_params: Remove unused local variable
* rasterizer_interface: Add missing documentation commentary
* maxwell_dma: Remove unused rasterizer reference
* video_core/gpu: Sort member declaration order to silent -Wreorder warning
* fermi_2d: Remove unused MemoryManager reference
* video_core: Silent unused variable warnings
* buffer_cache: Silent -Wreorder warnings
* kepler_memory: Remove unused MemoryManager reference
* gl_texture_cache: Add missing override
* buffer_cache: Add missing include
* shader/decode: Remove unused variables
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_block.h | 1 | ||||
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/video_core/buffer_cache/buffer_block.h b/src/video_core/buffer_cache/buffer_block.h index d2124443f..4b9193182 100644 --- a/src/video_core/buffer_cache/buffer_block.h +++ b/src/video_core/buffer_cache/buffer_block.h | |||
| @@ -69,7 +69,6 @@ protected: | |||
| 69 | private: | 69 | private: |
| 70 | CacheAddr cache_addr{}; | 70 | CacheAddr cache_addr{}; |
| 71 | CacheAddr cache_addr_end{}; | 71 | CacheAddr cache_addr_end{}; |
| 72 | u64 pages{}; | ||
| 73 | std::size_t size{}; | 72 | std::size_t size{}; |
| 74 | u64 epoch{}; | 73 | u64 epoch{}; |
| 75 | }; | 74 | }; |
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 38ce16ed5..2442ddfd6 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h | |||
| @@ -18,10 +18,7 @@ | |||
| 18 | #include "video_core/buffer_cache/buffer_block.h" | 18 | #include "video_core/buffer_cache/buffer_block.h" |
| 19 | #include "video_core/buffer_cache/map_interval.h" | 19 | #include "video_core/buffer_cache/map_interval.h" |
| 20 | #include "video_core/memory_manager.h" | 20 | #include "video_core/memory_manager.h" |
| 21 | 21 | #include "video_core/rasterizer_interface.h" | |
| 22 | namespace VideoCore { | ||
| 23 | class RasterizerInterface; | ||
| 24 | } | ||
| 25 | 22 | ||
| 26 | namespace VideoCommon { | 23 | namespace VideoCommon { |
| 27 | 24 | ||
| @@ -348,7 +345,6 @@ private: | |||
| 348 | const CacheAddr cache_addr_end = cache_addr + size - 1; | 345 | const CacheAddr cache_addr_end = cache_addr + size - 1; |
| 349 | u64 page_start = cache_addr >> block_page_bits; | 346 | u64 page_start = cache_addr >> block_page_bits; |
| 350 | const u64 page_end = cache_addr_end >> block_page_bits; | 347 | const u64 page_end = cache_addr_end >> block_page_bits; |
| 351 | const u64 num_pages = page_end - page_start + 1; | ||
| 352 | while (page_start <= page_end) { | 348 | while (page_start <= page_end) { |
| 353 | auto it = blocks.find(page_start); | 349 | auto it = blocks.find(page_start); |
| 354 | if (it == blocks.end()) { | 350 | if (it == blocks.end()) { |
| @@ -417,7 +413,10 @@ private: | |||
| 417 | return false; | 413 | return false; |
| 418 | } | 414 | } |
| 419 | 415 | ||
| 416 | VideoCore::RasterizerInterface& rasterizer; | ||
| 417 | Core::System& system; | ||
| 420 | std::unique_ptr<StreamBuffer> stream_buffer; | 418 | std::unique_ptr<StreamBuffer> stream_buffer; |
| 419 | |||
| 421 | TBufferType stream_buffer_handle{}; | 420 | TBufferType stream_buffer_handle{}; |
| 422 | 421 | ||
| 423 | bool invalidated = false; | 422 | bool invalidated = false; |
| @@ -441,8 +440,7 @@ private: | |||
| 441 | std::list<TBuffer> pending_destruction{}; | 440 | std::list<TBuffer> pending_destruction{}; |
| 442 | u64 epoch{}; | 441 | u64 epoch{}; |
| 443 | u64 modified_ticks{}; | 442 | u64 modified_ticks{}; |
| 444 | VideoCore::RasterizerInterface& rasterizer; | 443 | |
| 445 | Core::System& system; | ||
| 446 | std::recursive_mutex mutex; | 444 | std::recursive_mutex mutex; |
| 447 | }; | 445 | }; |
| 448 | 446 | ||