GPU: Move ghost default framebuffer getter to context creation

3 files changed, 12 insertions, 3 deletions

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 3ea18f72166..4e9b4a5b313 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -42,6 +42,7 @@ set(INC
   ../nodes
   ../nodes/intern
 
+  ../../../intern/ghost
   ../../../intern/glew-mx
   ../../../intern/guardedalloc
   ../../../intern/mantaflow/extern
diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.h
index 4f0edaf3ac8..0d9e1014803 100644
--- a/source/blender/gpu/GPU_context.h
+++ b/source/blender/gpu/GPU_context.h
@@ -35,7 +35,7 @@ extern "C" {
 
 typedef struct GPUContext GPUContext;
 
-GPUContext *GPU_context_create(GLuint default_framebuffer);
+GPUContext *GPU_context_create(void *ghost_window);
 void GPU_context_discard(GPUContext *);
 
 void GPU_context_active_set(GPUContext *);
diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc
index e6356580ea3..c3c0863f6cd 100644
--- a/source/blender/gpu/intern/gpu_context.cc
+++ b/source/blender/gpu/intern/gpu_context.cc
@@ -34,6 +34,8 @@
 #include "GPU_context.h"
 #include "GPU_framebuffer.h"
 
+#include "GHOST_C-api.h"
+
 #include "gpu_batch_private.h"
 #include "gpu_context_private.h"
 #include "gpu_matrix_private.h"
@@ -138,12 +140,18 @@ static void orphans_clear(GPUContext *ctx)
   orphans_mutex.unlock();
 }
 
-GPUContext *GPU_context_create(GLuint default_framebuffer)
+GPUContext *GPU_context_create(void *ghost_window)
 {
   /* BLI_assert(thread_is_main()); */
   GPUContext *ctx = new GPUContext;
   glGenVertexArrays(1, &ctx->default_vao);
-  ctx->default_framebuffer = default_framebuffer;
+  if (ghost_window != NULL) {
+    ctx->default_framebuffer = GHOST_GetDefaultOpenGLFramebuffer((GHOST_WindowHandle)ghost_window);
+  }
+  else {
+    ctx->default_framebuffer = 0;
+  }
+
   ctx->matrix_state = GPU_matrix_state_create();
   GPU_context_active_set(ctx);
   return ctx;