From 78c342889e2bbc98e5d2d4d41b04b36e0428fa63 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Mon, 25 Aug 2014 02:15:02 -0700
Subject: [PATCH] d3d: Prevent crash on Release() of render-to-tex.

Might be safer to do as we do in GLES and always have a texture...
---
 GPU/Directx9/TextureCacheDX9.cpp | 14 +++++---------
 GPU/Directx9/TextureCacheDX9.h   |  5 +++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp
index 6440f3d032..e37b423db1 100644
--- a/GPU/Directx9/TextureCacheDX9.cpp
+++ b/GPU/Directx9/TextureCacheDX9.cpp
@@ -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) {
diff --git a/GPU/Directx9/TextureCacheDX9.h b/GPU/Directx9/TextureCacheDX9.h
index 33defca882..4b01ca244f 100644
--- a/GPU/Directx9/TextureCacheDX9.h
+++ b/GPU/Directx9/TextureCacheDX9.h
@@ -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.