More paranoia

hrydgard · May 18, 2017 · 049d06c · 049d06c
1 parent df6ce90
commit 049d06c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/UI/TextureUtil.h b/UI/TextureUtil.h
@@ -21,10 +21,10 @@ class ManagedTexture : public GfxResourceHolder {
 			register_gl_resource_holder(this, "managed_texture", 0);
 	}
 	~ManagedTexture() {
-		if (texture_)
-			texture_->Release();
 		if (g_Config.iGPUBackend == (int)GPUBackend::OPENGL)
 			unregister_gl_resource_holder(this);
+		if (texture_)
+			texture_->Release();
 	}
 	void GLLost() override {
 		if (texture_)

diff --git a/ext/native/gfx/gl_lost_manager.cpp b/ext/native/gfx/gl_lost_manager.cpp
@@ -1,4 +1,5 @@
 #include <vector>
+#include <mutex>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -10,13 +11,15 @@ struct Holder {
 	int priority;
 };
 
+static std::mutex mutex;
 std::vector<Holder> *holders;
 
 static bool inLost;
 static bool inRestore;
 static int g_max_priority = 0;
 
 void register_gl_resource_holder(GfxResourceHolder *holder, const char *desc, int priority) {
+	std::lock_guard<std::mutex> lock(mutex);
 	if (inLost || inRestore) {
 		FLOG("BAD: Should not call register_gl_resource_holder from lost/restore path");
 		return;
@@ -31,6 +34,7 @@ void register_gl_resource_holder(GfxResourceHolder *holder, const char *desc, in
 }
 
 void unregister_gl_resource_holder(GfxResourceHolder *holder) {
+	std::lock_guard<std::mutex> lock(mutex);
 	if (inLost || inRestore) {
 		FLOG("BAD: Should not call unregister_gl_resource_holder from lost/restore path");
 		return;
@@ -53,6 +57,7 @@ void unregister_gl_resource_holder(GfxResourceHolder *holder) {
 }
 
 void gl_restore() {
+	std::lock_guard<std::mutex> lock(mutex);
 	inRestore = true;
 	if (!holders) {
 		WLOG("GL resource holder not initialized, cannot process restore request");
@@ -75,6 +80,7 @@ void gl_restore() {
 }
 
 void gl_lost() {
+	std::lock_guard<std::mutex> lock(mutex);
 	inLost = true;
 	if (!holders) {
 		WLOG("GL resource holder not initialized, cannot process restore request");
@@ -97,6 +103,7 @@ void gl_lost() {
 }
 
 void gl_lost_manager_init() {
+	std::lock_guard<std::mutex> lock(mutex);
 	if (holders) {
 		FLOG("Double GL lost manager init");
 		// Dead here (FLOG), no need to delete holders
@@ -106,6 +113,7 @@ void gl_lost_manager_init() {
 }
 
 void gl_lost_manager_shutdown() {
+	std::lock_guard<std::mutex> lock(mutex);
 	if (!holders) {
 		FLOG("Lost manager already shutdown");
 	} else if (holders->size() > 0) {
@@ -114,4 +122,4 @@ void gl_lost_manager_shutdown() {
 
 	delete holders;
 	holders = 0;
-}
+}