Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-08-06 05:30:38 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-08 02:15:28 +0300
commit0ccf3f89d2e2389d433d1ab682ad04310a9b19ae (patch)
tree4670325763c47478f86f29de394e3de933943f1d /source/blender/gpu/intern/gpu_context.cc
parent0255f1e0225d2eebfd39a9c16d9be299857b9efc (diff)
GPU: Move ghost default framebuffer getter to context creation
Diffstat (limited to 'source/blender/gpu/intern/gpu_context.cc')
-rw-r--r--source/blender/gpu/intern/gpu_context.cc12
1 files changed, 10 insertions, 2 deletions
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;