summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_core/rasterizer_accelerated.cpp6
-rw-r--r--src/video_core/rasterizer_accelerated.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/video_core/rasterizer_accelerated.cpp b/src/video_core/rasterizer_accelerated.cpp
index 62d84c0f8..6decd2546 100644
--- a/src/video_core/rasterizer_accelerated.cpp
+++ b/src/video_core/rasterizer_accelerated.cpp
@@ -18,10 +18,10 @@ RasterizerAccelerated::~RasterizerAccelerated() = default;
18void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int delta) { 18void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int delta) {
19 const auto page_end = Common::DivCeil(addr + size, Core::Memory::PAGE_SIZE); 19 const auto page_end = Common::DivCeil(addr + size, Core::Memory::PAGE_SIZE);
20 for (auto page = addr >> Core::Memory::PAGE_BITS; page != page_end; ++page) { 20 for (auto page = addr >> Core::Memory::PAGE_BITS; page != page_end; ++page) {
21 auto& count = cached_pages.at(page >> 3).Count(page); 21 auto& count = cached_pages.at(page >> 2).Count(page);
22 22
23 if (delta > 0) { 23 if (delta > 0) {
24 ASSERT_MSG(count < UINT8_MAX, "Count may overflow!"); 24 ASSERT_MSG(count < UINT16_MAX, "Count may overflow!");
25 } else if (delta < 0) { 25 } else if (delta < 0) {
26 ASSERT_MSG(count > 0, "Count may underflow!"); 26 ASSERT_MSG(count > 0, "Count may underflow!");
27 } else { 27 } else {
@@ -29,7 +29,7 @@ void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int del
29 } 29 }
30 30
31 // Adds or subtracts 1, as count is a unsigned 8-bit value 31 // Adds or subtracts 1, as count is a unsigned 8-bit value
32 count += static_cast<u8>(delta); 32 count += static_cast<u16>(delta);
33 33
34 // Assume delta is either -1 or 1 34 // Assume delta is either -1 or 1
35 if (count == 0) { 35 if (count == 0) {
diff --git a/src/video_core/rasterizer_accelerated.h b/src/video_core/rasterizer_accelerated.h
index 9227a4adc..ea879bfdd 100644
--- a/src/video_core/rasterizer_accelerated.h
+++ b/src/video_core/rasterizer_accelerated.h
@@ -29,20 +29,20 @@ private:
29 public: 29 public:
30 CacheEntry() = default; 30 CacheEntry() = default;
31 31
32 std::atomic_uint8_t& Count(std::size_t page) { 32 std::atomic_uint16_t& Count(std::size_t page) {
33 return values[page & 7]; 33 return values[page & 3];
34 } 34 }
35 35
36 const std::atomic_uint8_t& Count(std::size_t page) const { 36 const std::atomic_uint16_t& Count(std::size_t page) const {
37 return values[page & 7]; 37 return values[page & 3];
38 } 38 }
39 39
40 private: 40 private:
41 std::array<std::atomic_uint8_t, 8> values{}; 41 std::array<std::atomic_uint16_t, 4> values{};
42 }; 42 };
43 static_assert(sizeof(CacheEntry) == 8, "CacheEntry should be 8 bytes!"); 43 static_assert(sizeof(CacheEntry) == 8, "CacheEntry should be 8 bytes!");
44 44
45 std::array<CacheEntry, 0x800000> cached_pages; 45 std::array<CacheEntry, 0x1000000> cached_pages;
46 Core::Memory::Memory& cpu_memory; 46 Core::Memory::Memory& cpu_memory;
47}; 47};
48 48