1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc
index dd3e5bea604..0a488c0dfc0 100644
--- a/source/blender/gpu/intern/gpu_immediate.cc
+++ b/source/blender/gpu/intern/gpu_immediate.cc
@@ -39,16 +39,11 @@
 
 using namespace blender::gpu;
 
-static Immediate *imm = NULL;
-
-void immInit(void)
-{
-  /* TODO Remove */
-}
+static thread_local Immediate *imm = NULL;
 
 void immActivate(void)
 {
-  imm = GPU_context_active_get()->imm;
+  imm = Context::get()->imm;
 }
 
 void immDeactivate(void)
@@ -56,11 +51,6 @@ void immDeactivate(void)
   imm = NULL;
 }
 
-void immDestroy(void)
-{
-  /* TODO Remove */
-}
-
 GPUVertFormat *immVertexFormat(void)
 {
   GPU_vertformat_clear(&imm->vertex_format);