GPU: Add GC to FBOs and UBOs and centralize all GCs

GPUFrameBuffers were being free when no context was attached or in the
wrong gl context. This make sure this does not happen again.

You can now safely free any gl resource from any thread (well as long as
it's not used anymore!).

2 files changed, 4 insertions, 3 deletions

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 0c7c85e0d94..f7d6561e17f 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -119,6 +119,7 @@
 
 #include "GPU_material.h"
 #include "GPU_draw.h"
+#include "GPU_immediate.h"
 #include "GPU_init_exit.h"
 
 #include "BKE_sound.h"
@@ -515,9 +516,11 @@ void WM_exit_ext(bContext *C, const bool do_python)
 	BLF_exit();
 
 	if (opengl_is_init) {
+		DRW_opengl_context_enable_ex(false);
 		GPU_pass_cache_free();
-		DRW_opengl_context_destroy();
 		GPU_exit();
+		DRW_opengl_context_disable_ex(false);
+		DRW_opengl_context_destroy();
 	}
 
 #ifdef WITH_INTERNATIONAL
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index b87ae7e076c..c1006db34ef 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1921,8 +1921,6 @@ void wm_window_raise(wmWindow *win)
 
 void wm_window_swap_buffers(wmWindow *win)
 {
-	GPU_texture_orphans_delete(); /* XXX should be done elsewhere. */
-	GPU_material_orphans_delete(); /* XXX Amen to that. */
 	GHOST_SwapWindowBuffers(win->ghostwin);
 }