diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_global_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_global_cache.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_global_cache.cpp b/src/video_core/renderer_opengl/gl_global_cache.cpp index c7f32feaa..7161d1dea 100644 --- a/src/video_core/renderer_opengl/gl_global_cache.cpp +++ b/src/video_core/renderer_opengl/gl_global_cache.cpp | |||
| @@ -57,8 +57,8 @@ GlobalRegion GlobalRegionCacheOpenGL::GetUncachedGlobalRegion(VAddr addr, u32 si | |||
| 57 | return region; | 57 | return region; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | void GlobalRegionCacheOpenGL::ReserveGlobalRegion(const GlobalRegion& region) { | 60 | void GlobalRegionCacheOpenGL::ReserveGlobalRegion(GlobalRegion region) { |
| 61 | reserve[region->GetAddr()] = region; | 61 | reserve.insert_or_assign(region->GetAddr(), std::move(region)); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | GlobalRegionCacheOpenGL::GlobalRegionCacheOpenGL(RasterizerOpenGL& rasterizer) | 64 | GlobalRegionCacheOpenGL::GlobalRegionCacheOpenGL(RasterizerOpenGL& rasterizer) |
diff --git a/src/video_core/renderer_opengl/gl_global_cache.h b/src/video_core/renderer_opengl/gl_global_cache.h index 37830bb7c..ba2bdc60c 100644 --- a/src/video_core/renderer_opengl/gl_global_cache.h +++ b/src/video_core/renderer_opengl/gl_global_cache.h | |||
| @@ -30,12 +30,12 @@ public: | |||
| 30 | explicit CachedGlobalRegion(VAddr addr, u32 size); | 30 | explicit CachedGlobalRegion(VAddr addr, u32 size); |
| 31 | 31 | ||
| 32 | /// Gets the address of the shader in guest memory, required for cache management | 32 | /// Gets the address of the shader in guest memory, required for cache management |
| 33 | VAddr GetAddr() const { | 33 | VAddr GetAddr() const override { |
| 34 | return addr; | 34 | return addr; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | /// Gets the size of the shader in guest memory, required for cache management | 37 | /// Gets the size of the shader in guest memory, required for cache management |
| 38 | std::size_t GetSizeInBytes() const { | 38 | std::size_t GetSizeInBytes() const override { |
| 39 | return size; | 39 | return size; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| @@ -70,7 +70,7 @@ public: | |||
| 70 | private: | 70 | private: |
| 71 | GlobalRegion TryGetReservedGlobalRegion(VAddr addr, u32 size) const; | 71 | GlobalRegion TryGetReservedGlobalRegion(VAddr addr, u32 size) const; |
| 72 | GlobalRegion GetUncachedGlobalRegion(VAddr addr, u32 size); | 72 | GlobalRegion GetUncachedGlobalRegion(VAddr addr, u32 size); |
| 73 | void ReserveGlobalRegion(const GlobalRegion& region); | 73 | void ReserveGlobalRegion(GlobalRegion region); |
| 74 | 74 | ||
| 75 | std::unordered_map<VAddr, GlobalRegion> reserve; | 75 | std::unordered_map<VAddr, GlobalRegion> reserve; |
| 76 | }; | 76 | }; |