summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2019-11-24 02:55:02 -0500
committerGravatar GitHub2019-11-24 02:55:02 -0500
commite81e0036b4b2cb54329483cab69b45661ea142f4 (patch)
treeb33d3c5cd53d80dba1c52b8f146b7a7e216963ca /src
parentMerge pull request #3114 from FernandoS27/cond-var (diff)
parentbuffer_cache: Remove brace initialized for objects with default constructor (diff)
downloadyuzu-e81e0036b4b2cb54329483cab69b45661ea142f4.tar.gz
yuzu-e81e0036b4b2cb54329483cab69b45661ea142f4.tar.xz
yuzu-e81e0036b4b2cb54329483cab69b45661ea142f4.zip
Merge pull request #3145 from ReinUsesLisp/buffer-cache-init
buffer_cache: Remove brace initialized for objects with default constructor
Diffstat (limited to 'src')
-rw-r--r--src/video_core/buffer_cache/buffer_cache.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 4408b5001..0510ed777 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -427,8 +427,8 @@ private:
427 427
428 VideoCore::RasterizerInterface& rasterizer; 428 VideoCore::RasterizerInterface& rasterizer;
429 Core::System& system; 429 Core::System& system;
430 std::unique_ptr<StreamBuffer> stream_buffer;
431 430
431 std::unique_ptr<StreamBuffer> stream_buffer;
432 TBufferType stream_buffer_handle{}; 432 TBufferType stream_buffer_handle{};
433 433
434 bool invalidated = false; 434 bool invalidated = false;
@@ -440,18 +440,18 @@ private:
440 using IntervalSet = boost::icl::interval_set<CacheAddr>; 440 using IntervalSet = boost::icl::interval_set<CacheAddr>;
441 using IntervalCache = boost::icl::interval_map<CacheAddr, MapInterval>; 441 using IntervalCache = boost::icl::interval_map<CacheAddr, MapInterval>;
442 using IntervalType = typename IntervalCache::interval_type; 442 using IntervalType = typename IntervalCache::interval_type;
443 IntervalCache mapped_addresses{}; 443 IntervalCache mapped_addresses;
444 444
445 static constexpr u64 write_page_bit{11}; 445 static constexpr u64 write_page_bit = 11;
446 std::unordered_map<u64, u32> written_pages{}; 446 std::unordered_map<u64, u32> written_pages;
447 447
448 static constexpr u64 block_page_bits{21}; 448 static constexpr u64 block_page_bits = 21;
449 static constexpr u64 block_page_size{1 << block_page_bits}; 449 static constexpr u64 block_page_size = 1ULL << block_page_bits;
450 std::unordered_map<u64, TBuffer> blocks{}; 450 std::unordered_map<u64, TBuffer> blocks;
451 451
452 std::list<TBuffer> pending_destruction{}; 452 std::list<TBuffer> pending_destruction;
453 u64 epoch{}; 453 u64 epoch = 0;
454 u64 modified_ticks{}; 454 u64 modified_ticks = 0;
455 455
456 std::recursive_mutex mutex; 456 std::recursive_mutex mutex;
457}; 457};