[Bf-blender-cvs] [6fa05e2c29a] blender-v3.4-release: Fix T102306: buildtime shader compilation option fails under Wayland

Campbell Barton noreply at git.blender.org
Wed Nov 9 03:53:13 CET 2022


Commit: 6fa05e2c29a28475799fab4a9ce51bd0bc53ca92
Author: Campbell Barton
Date:   Wed Nov 9 13:32:53 2022 +1100
Branches: blender-v3.4-release
https://developer.blender.org/rB6fa05e2c29a28475799fab4a9ce51bd0bc53ca92

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.

===================================================================

M	source/blender/gpu/intern/gpu_shader_builder.cc

===================================================================

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_);



More information about the Bf-blender-cvs mailing list