mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
renderer_opengl/gl_global_cache: Replace indexing for assignment with insert_or_assign
The previous code had some minor issues with it, really not a big deal, but amending it is basically 'free', so I figured, "why not?". With the standard container maps, when: map[key] = thing; is done, this can cause potentially undesirable behavior in certain scenarios. In particular, if there's no value associated with the key, then the map constructs a default initialized instance of the value type. In this case, since it's a std::shared_ptr (as a type alias) that is the value type, this will construct a std::shared_pointer, and then assign over it (with objects that are quite large, or actively heap allocate this can be extremely undesirable). We also make the function take the region by value, as we can avoid a copy (and by extension with std::shared_ptr, a copy causes an atomic reference count increment), in certain scenarios when ownership isn't a concern (i.e. when ReserveGlobalRegion is called with an rvalue reference, then no copy at all occurs). So, it's more-or-less a "free" gain without many downsides.
This commit is contained in:
parent
1070c020db
commit
3350c0a779
2 changed files with 3 additions and 3 deletions
|
@ -57,8 +57,8 @@ GlobalRegion GlobalRegionCacheOpenGL::GetUncachedGlobalRegion(VAddr addr, u32 si
|
||||||
return region;
|
return region;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GlobalRegionCacheOpenGL::ReserveGlobalRegion(const GlobalRegion& region) {
|
void GlobalRegionCacheOpenGL::ReserveGlobalRegion(GlobalRegion region) {
|
||||||
reserve[region->GetAddr()] = region;
|
reserve.insert_or_assign(region->GetAddr(), std::move(region));
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalRegionCacheOpenGL::GlobalRegionCacheOpenGL(RasterizerOpenGL& rasterizer)
|
GlobalRegionCacheOpenGL::GlobalRegionCacheOpenGL(RasterizerOpenGL& rasterizer)
|
||||||
|
|
|
@ -70,7 +70,7 @@ public:
|
||||||
private:
|
private:
|
||||||
GlobalRegion TryGetReservedGlobalRegion(VAddr addr, u32 size) const;
|
GlobalRegion TryGetReservedGlobalRegion(VAddr addr, u32 size) const;
|
||||||
GlobalRegion GetUncachedGlobalRegion(VAddr addr, u32 size);
|
GlobalRegion GetUncachedGlobalRegion(VAddr addr, u32 size);
|
||||||
void ReserveGlobalRegion(const GlobalRegion& region);
|
void ReserveGlobalRegion(GlobalRegion region);
|
||||||
|
|
||||||
std::unordered_map<VAddr, GlobalRegion> reserve;
|
std::unordered_map<VAddr, GlobalRegion> reserve;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue