diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-31 20:56:04 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-09-01 01:30:36 +0300 |
| commit | 058d29ed9a3e971049c0d9d99f1cf571bfb0efae (patch) | |
| tree | 04e045feec7bd75728b4e3f49bd978ad5b0e1596 /source | |
| parent | 13b0a697a07e84abe5a62168ba75f38d325d3f22 (diff) | |
GHOST: Enable debug context on offscreen context too
This was a long standing TODO. This was also preventing debug callbacks
form other context than the main window.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/tests/shaders_test.cc | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc index b2f1020ed98..c991b791686 100644 --- a/source/blender/draw/tests/shaders_test.cc +++ b/source/blender/draw/tests/shaders_test.cc @@ -24,8 +24,9 @@ class DrawTest : public ::testing::Test { void SetUp() override { + GHOST_GLSettings glSettings = {0}; ghost_system = GHOST_CreateSystem(); - ghost_context = GHOST_CreateOpenGLContext(ghost_system); + ghost_context = GHOST_CreateOpenGLContext(ghost_system, glSettings); context = GPU_context_create(0); GPU_init(); DRW_draw_state_init_gtests(GPU_SHADER_CFG_DEFAULT); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 04d5aeb337d..0e19f79e659 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2485,7 +2485,12 @@ void *WM_opengl_context_create(void) */ BLI_assert(BLI_thread_is_main()); BLI_assert(GPU_framebuffer_active_get() == GPU_framebuffer_back_get()); - return GHOST_CreateOpenGLContext(g_system); + + GHOST_GLSettings glSettings = {0}; + if (G.debug & G_DEBUG_GPU) { + glSettings.flags |= GHOST_glDebugContext; + } + return GHOST_CreateOpenGLContext(g_system, glSettings); } void WM_opengl_context_dispose(void *context) |