From 0ccf3f89d2e2389d433d1ab682ad04310a9b19ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 6 Aug 2020 04:30:38 +0200 Subject: GPU: Move ghost default framebuffer getter to context creation --- source/blender/gpu/intern/gpu_context.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'source/blender/gpu/intern') 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; -- cgit v1.2.3