ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #928 from RadWolfie/fix-hash-update 

Fix visual update for RCT title
This commit is contained in:
Luke Usher 2018-02-19 06:32:26 +00:00 committed by GitHub
parent d6fc60f4c0 03f9ce12b5
commit b2fc99e053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -757,6 +757,7 @@ typedef struct {
bool forceRehash = false;
std::chrono::time_point<std::chrono::high_resolution_clock> nextHashTime;
std::chrono::milliseconds hashLifeTime = 1ms;
std::chrono::time_point<std::chrono::high_resolution_clock> lastUpdate;
} host_resource_info_t;
std::map <resource_key_t, host_resource_info_t> g_HostResources;
@ -882,8 +883,9 @@ bool HostResourceRequiresUpdate(resource_key_t key)
if (it->second.hash != oldHash) {
// The data changed, so reset the hash lifetime
it->second.hashLifeTime = 1ms;
it->second.lastUpdate = now;
modified = true;
} else {
} else if (it->second.lastUpdate + 1000ms < now) {
// The data did not change, so increase the hash lifetime
// TODO: choose a sensible upper limit
if (it->second.hashLifeTime < 1000ms) {
@ -915,7 +917,8 @@ void SetHostResource(XTL::X_D3DResource* pXboxResource, XTL::IDirect3DResource8*
hostResourceInfo.szXboxDataSize = GetXboxResourceSize(pXboxResource);
hostResourceInfo.hash = XXHash32::hash(hostResourceInfo.pXboxData, hostResourceInfo.szXboxDataSize, 0);
hostResourceInfo.hashLifeTime = 1ms;
hostResourceInfo.nextHashTime = std::chrono::high_resolution_clock::now() + hostResourceInfo.hashLifeTime;
hostResourceInfo.lastUpdate = std::chrono::high_resolution_clock::now();
hostResourceInfo.nextHashTime = hostResourceInfo.lastUpdate + hostResourceInfo.hashLifeTime;
hostResourceInfo.forceRehash = false;
g_HostResources[key] = hostResourceInfo;