preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-28 17:54:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

d3d: Prevent crash on Release() of render-to-tex.

Browse Source 
Might be safer to do as we do in GLES and always have a texture...
This commit is contained in:
Unknown W. Brackets
2014-08-25 02:15:02 -07:00
parent a533d76c8e
commit 78c342889e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPU/Directx9/TextureCacheDX9.cpp
+5 -9
View File
@@ -73,13 +73,11 @@ void TextureCacheDX9::Clear(bool delete_them) {
if (delete_them) {
for (TexCache::iterator iter = cache.begin(); iter != cache.end(); ++iter) {
DEBUG_LOG(G3D, "Deleting texture %p", iter->second.texture);
if (iter->second.texture)
iter->second.texture->Release();
iter->second.ReleaseTexture();
}
for (TexCache::iterator iter = secondCache.begin(); iter != secondCache.end(); ++iter) {
DEBUG_LOG(G3D, "Deleting texture %p", iter->second.texture);
if (iter->second.texture)
iter->second.texture->Release();
iter->second.ReleaseTexture();
}
}
if (cache.size() + secondCache.size()) {
@@ -102,8 +100,7 @@ void TextureCacheDX9::Decimate() {
int killAge = lowMemoryMode_ ? TEXTURE_KILL_AGE_LOWMEM : TEXTURE_KILL_AGE;
for (TexCache::iterator iter = cache.begin(); iter != cache.end(); ) {
if (iter->second.lastFrame + killAge < gpuStats.numFlips) {
if (iter->second.texture)
iter->second.texture->Release();
iter->second.ReleaseTexture();
cache.erase(iter++);
} else {
++iter;
@@ -114,8 +111,7 @@ void TextureCacheDX9::Decimate() {
for (TexCache::iterator iter = secondCache.begin(); iter != secondCache.end(); ) {
// In low memory mode, we kill them all.
if (lowMemoryMode_ || iter->second.lastFrame + TEXTURE_KILL_AGE < gpuStats.numFlips) {
if (iter->second.texture)
iter->second.texture->Release();
iter->second.ReleaseTexture();
secondCache.erase(iter++);
} else {
++iter;
@@ -912,7 +908,7 @@ void TextureCacheDX9::SetTexture(bool force) {
if (entry->texture == lastBoundTexture) {
lastBoundTexture = INVALID_TEX;
}
entry->texture->Release();
entry->ReleaseTexture();
}
}
if (entry->status == TexCacheEntry::STATUS_RELIABLE) {
GPU/Directx9/TextureCacheDX9.h
+5
View File
@@ -107,6 +107,11 @@ private:
float lodBias;
bool Matches(u16 dim2, u8 format2, int maxLevel2);
void ReleaseTexture() {
if (texture) {
texture->Release();
}
}
};
void Decimate(); // Run this once per frame to get rid of old textures.