From 4d4f9cc104c9440de36e3ff3f6b374acd8074885 Mon Sep 17 00:00:00 2001 From: Rodrigo Locatti Date: Fri, 30 Aug 2019 15:08:00 -0300 Subject: 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 --- src/video_core/buffer_cache/buffer_cache.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/video_core/buffer_cache/buffer_cache.h') 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 @@ #include "video_core/buffer_cache/buffer_block.h" #include "video_core/buffer_cache/map_interval.h" #include "video_core/memory_manager.h" - -namespace VideoCore { -class RasterizerInterface; -} +#include "video_core/rasterizer_interface.h" namespace VideoCommon { @@ -348,7 +345,6 @@ private: const CacheAddr cache_addr_end = cache_addr + size - 1; u64 page_start = cache_addr >> block_page_bits; const u64 page_end = cache_addr_end >> block_page_bits; - const u64 num_pages = page_end - page_start + 1; while (page_start <= page_end) { auto it = blocks.find(page_start); if (it == blocks.end()) { @@ -417,7 +413,10 @@ private: return false; } + VideoCore::RasterizerInterface& rasterizer; + Core::System& system; std::unique_ptr stream_buffer; + TBufferType stream_buffer_handle{}; bool invalidated = false; @@ -441,8 +440,7 @@ private: std::list pending_destruction{}; u64 epoch{}; u64 modified_ticks{}; - VideoCore::RasterizerInterface& rasterizer; - Core::System& system; + std::recursive_mutex mutex; }; -- cgit v1.2.3