Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

If the same raster image is used with different interpolation methods then these are now cached separately.

Browse source
This commit is contained in:
Leon Styhre 2022-08-16 22:37:36 +02:00
parent 967b98008b
commit 225a602a74
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
es-core/src/resources/TextureResource.cpp
View file

@ -89,11 +89,22 @@ void TextureResource::manualUnload(std::string path, bool tile)
{ {
const std::string canonicalPath = Utils::FileSystem::getCanonicalPath(path); const std::string canonicalPath = Utils::FileSystem::getCanonicalPath(path);
TextureKeyType key(canonicalPath, tile); // TODO: We always attempt to unload both the linear and nearest interpolation entries
auto foundTexture = sTextureMap.find(key); // which is a bit of a hack. Rewrite this to only unload the requested image.
{
TextureKeyType key {canonicalPath, tile, false};
auto foundTexture = sTextureMap.find(key);
if (foundTexture != sTextureMap.cend()) { if (foundTexture != sTextureMap.cend())
sTextureMap.erase(foundTexture); sTextureMap.erase(foundTexture);
}
{
TextureKeyType key {canonicalPath, tile, true};
auto foundTexture = sTextureMap.find(key);
if (foundTexture != sTextureMap.cend())
sTextureMap.erase(foundTexture);
} }
} }
@ -152,7 +163,7 @@ std::shared_ptr<TextureResource> TextureResource::get(const std::string& path,
return tex; return tex;
} }
TextureKeyType key {canonicalPath, tile}; TextureKeyType key {canonicalPath, tile, linearMagnify};
auto foundTexture = sTextureMap.find(key); auto foundTexture = sTextureMap.find(key);
if (foundTexture != sTextureMap.cend()) { if (foundTexture != sTextureMap.cend()) {
@ -163,12 +174,12 @@ std::shared_ptr<TextureResource> TextureResource::get(const std::string& path,
// Need to create it. // Need to create it.
std::shared_ptr<TextureResource> tex; std::shared_ptr<TextureResource> tex;
tex = std::shared_ptr<TextureResource>( tex = std::shared_ptr<TextureResource>(
new TextureResource(key.first, tile, dynamic, linearMagnify, forceRasterization)); new TextureResource(std::get<0>(key), tile, dynamic, linearMagnify, forceRasterization));
std::shared_ptr<TextureData> data = sTextureDataManager.get(tex.get()); std::shared_ptr<TextureData> data = sTextureDataManager.get(tex.get());
// Is it an SVG? // Is it an SVG?
if (Utils::String::toLower(key.first.substr(key.first.size() - 4, std::string::npos)) != if (Utils::String::toLower(
".svg") { std::get<0>(key).substr(std::get<0>(key).size() - 4, std::string::npos)) != ".svg") {
// Probably not. Add it to our map. We don't add SVGs because 2 SVGs might be // Probably not. Add it to our map. We don't add SVGs because 2 SVGs might be
// rasterized at different sizes. // rasterized at different sizes.
sTextureMap[key] = std::weak_ptr<TextureResource>(tex); sTextureMap[key] = std::weak_ptr<TextureResource>(tex);

2
es-core/src/resources/TextureResource.h
View file

@ -91,7 +91,7 @@ private:
glm::vec2 mSourceSize; glm::vec2 mSourceSize;
bool mForceLoad; bool mForceLoad;
using TextureKeyType = std::pair<std::string, bool>; using TextureKeyType = std::tuple<std::string, bool, bool>;
// Map of textures, used to prevent duplicate textures. // Map of textures, used to prevent duplicate textures.
static inline std::map<TextureKeyType, std::weak_ptr<TextureResource>> sTextureMap; static inline std::map<TextureKeyType, std::weak_ptr<TextureResource>> sTextureMap;
// Set of all textures, used for memory management. // Set of all textures, used for memory management.