diff options
| author | 2019-07-02 22:27:04 -0400 | |
|---|---|---|
| committer | 2019-07-02 22:27:04 -0400 | |
| commit | 2521007c09876699d9433ab0bf791932d45e768a (patch) | |
| tree | 21431fc9c62b49eec293d15007228c4bb44f0def /src/video_core/rasterizer_cache.h | |
| parent | Merge pull request #2660 from bakugo/deltafragments (diff) | |
| parent | rasterizer_cache: Protect inherited caches from submission level (diff) | |
| download | yuzu-2521007c09876699d9433ab0bf791932d45e768a.tar.gz yuzu-2521007c09876699d9433ab0bf791932d45e768a.tar.xz yuzu-2521007c09876699d9433ab0bf791932d45e768a.zip | |
Merge pull request #2659 from FernandoS27/safe-caches
rasterizer_cache: Protect inherited caches from submission level
Diffstat (limited to 'src/video_core/rasterizer_cache.h')
| -rw-r--r-- | src/video_core/rasterizer_cache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/rasterizer_cache.h b/src/video_core/rasterizer_cache.h index 0c4ea1494..6de1597a2 100644 --- a/src/video_core/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache.h | |||
| @@ -169,6 +169,8 @@ protected: | |||
| 169 | object->MarkAsModified(false, *this); | 169 | object->MarkAsModified(false, *this); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | std::recursive_mutex mutex; | ||
| 173 | |||
| 172 | private: | 174 | private: |
| 173 | /// Returns a list of cached objects from the specified memory region, ordered by access time | 175 | /// Returns a list of cached objects from the specified memory region, ordered by access time |
| 174 | std::vector<T> GetSortedObjectsFromRegion(CacheAddr addr, u64 size) { | 176 | std::vector<T> GetSortedObjectsFromRegion(CacheAddr addr, u64 size) { |
| @@ -208,5 +210,4 @@ private: | |||
| 208 | IntervalCache interval_cache; ///< Cache of objects | 210 | IntervalCache interval_cache; ///< Cache of objects |
| 209 | u64 modified_ticks{}; ///< Counter of cache state ticks, used for in-order flushing | 211 | u64 modified_ticks{}; ///< Counter of cache state ticks, used for in-order flushing |
| 210 | VideoCore::RasterizerInterface& rasterizer; | 212 | VideoCore::RasterizerInterface& rasterizer; |
| 211 | std::recursive_mutex mutex; | ||
| 212 | }; | 213 | }; |