libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD25: Cache related changes

Browse Source 
- Increase the resource cache limits
- Added a check before forcing resources to be freed
- Only force free image and animation resources, with a warning. It seems like there is
a bug in the resource reference code and several bitmap resources are not freed - added
a FIXME
- Clarify that initializeAnimationResource() is used with XML resources

svn-id: r55736
This commit is contained in:
Filippos Karapetis 2011-02-02 19:32:04 +00:00
parent 1d38568bc1
commit 832cfddf34
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sword25/gfx/animation.h
View File

@ -211,6 +211,10 @@ private:
void initMembers();
AnimationDescription *getAnimationDescription() const;
/**
* Initializes a new animation resource from an XML file.
*/
void initializeAnimationResource(const Common::String &fileName);
};

47
engines/sword25/kernel/resmanager.cpp
View File

@ -43,11 +43,12 @@ namespace Sword25 {
// Sets the amount of resources that are simultaneously loaded.
// This needs to be a relatively high number, as all the animation
// frames in each scene are loaded as separate resources.
#define SWORD25_RESOURCECACHE_MIN 200
// Also, George's walk states are all loaded here (150 files)
#define SWORD25_RESOURCECACHE_MIN 400
// The maximum number of loaded resources. If more than these resources
// are loaded, the resource manager will start purging resources till it
// hits the minimum limit above
#define SWORD25_RESOURCECACHE_MAX 300
#define SWORD25_RESOURCECACHE_MAX 500
ResourceManager::~ResourceManager() {
// Clear all unlocked resources
@ -105,16 +106,29 @@ void ResourceManager::deleteResourcesIfNecessary() {
} while (iter != _resources.begin() && _resources.size() >= SWORD25_RESOURCECACHE_MIN);
// Are we still above the minimum? If yes, then start releasing locked resources
// FIXME: This code shouldn't be needed at all, but it seems like there is a bug
// in the resource lock code, and resources are not unlocked when changing rooms.
// Only image/animation resources are unlocked forcibly, thus this shouldn't have
// any impact on the game itself.
if (_resources.size() <= SWORD25_RESOURCECACHE_MIN)
return;
iter = _resources.end();
do {
--iter;
// Forcibly unlock the resource
while ((*iter)->getLockCount() > 0) {
(*iter)->release();
};
// Only unlock image/animation resources
if ((*iter)->getFileName().hasSuffix(".swf") ||
(*iter)->getFileName().hasSuffix(".png")) {
iter = deleteResource(*iter);
warning("Forcibly unlocking %s", (*iter)->getFileName().c_str());
// Forcibly unlock the resource
while ((*iter)->getLockCount() > 0)
(*iter)->release();
iter = deleteResource(*iter);
}
} while (iter != _resources.begin() && _resources.size() >= SWORD25_RESOURCECACHE_MIN);
}
@ -145,21 +159,12 @@ Resource *ResourceManager::requestResource(const Common::String &fileName) {
// Determine whether the resource is already loaded
// If the resource is found, it will be placed at the head of the resource list and returned
{
Resource *pResource = getResource(uniqueFileName);
if (!pResource)
pResource = loadResource(uniqueFileName);
if (pResource) {
moveToFront(pResource);
(pResource)->addReference();
return pResource;
}
}
Resource *pResource = loadResource(uniqueFileName);
Resource *pResource = getResource(uniqueFileName);
if (!pResource)
pResource = loadResource(uniqueFileName);
if (pResource) {
pResource->addReference();
moveToFront(pResource);
(pResource)->addReference();
return pResource;
}