From 6fa05e2c29a28475799fab4a9ce51bd0bc53ca92 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 Nov 2022 13:32:53 +1100 Subject: Fix T102306: buildtime shader compilation option fails under Wayland libdecor (for window decorations) was crashing on exit with the shader builder, avoid the crash by calling the "background" system creation function which doesn't initialize window management under Wayland. --- source/blender/gpu/intern/gpu_shader_builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/gpu/intern/gpu_shader_builder.cc b/source/blender/gpu/intern/gpu_shader_builder.cc index abb45ca074a..96e3eacd6f5 100644 --- a/source/blender/gpu/intern/gpu_shader_builder.cc +++ b/source/blender/gpu/intern/gpu_shader_builder.cc @@ -59,7 +59,7 @@ void ShaderBuilder::init() break; } - ghost_system_ = GHOST_CreateSystem(); + ghost_system_ = GHOST_CreateSystemBackground(); ghost_context_ = GHOST_CreateOpenGLContext(ghost_system_, glSettings); GHOST_ActivateOpenGLContext(ghost_context_); -- cgit v1.2.3 From 801db0d429a279d1084d2f61c00088917547407e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 Nov 2022 13:54:19 +1100 Subject: Revert "Fix T102306: buildtime shader compilation option fails under Wayland" This reverts commit 6fa05e2c29a28475799fab4a9ce51bd0bc53ca92. --- source/blender/gpu/intern/gpu_shader_builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/gpu/intern/gpu_shader_builder.cc b/source/blender/gpu/intern/gpu_shader_builder.cc index 96e3eacd6f5..abb45ca074a 100644 --- a/source/blender/gpu/intern/gpu_shader_builder.cc +++ b/source/blender/gpu/intern/gpu_shader_builder.cc @@ -59,7 +59,7 @@ void ShaderBuilder::init() break; } - ghost_system_ = GHOST_CreateSystemBackground(); + ghost_system_ = GHOST_CreateSystem(); ghost_context_ = GHOST_CreateOpenGLContext(ghost_system_, glSettings); GHOST_ActivateOpenGLContext(ghost_context_); -- cgit v1.2.3