griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #122070: Crash when calling python render method

Browse Source 
Blender crashes when calling the python render operator when GPU
compositor execution is enabled. This is due to a missing system GPU
context, which is not initialized for blocking rendering. So this patch
ensures the system GPU context before compositing. Additionally, it
removes the assert that ensures a non main thread execution, since the
assumption apparently does not really hold.

Pull Request: https://projects.blender.org/blender/blender/pulls/122176
This commit is contained in:
Omar Emara
2024-05-24 07:58:39 +02:00
committed by Omar Emara
parent 1f243f1d36
commit 6ae98e43a9
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/render/intern/compositor.cc
View File

@@ -479,10 +479,6 @@ class RealtimeCompositor {
public:
RealtimeCompositor(Render &render, const ContextInputData &input_data) : render_(render)
{
/* Ensure that in foreground mode we are using different contexts for main and render threads,
* to avoid them blocking each other. */
BLI_assert(!BLI_thread_is_main() || G.background);
/* Create resources with GPU context enabled. */
DRW_render_context_enable(&render_);
texture_pool_ = std::make_unique<TexturePool>();
@@ -515,19 +511,16 @@ class RealtimeCompositor {
/* Evaluate the compositor and output to the scene render result. */
void execute(const ContextInputData &input_data)
{
/* Ensure that in foreground mode we are using different contexts for main and render threads,
* to avoid them blocking each other. */
BLI_assert(!BLI_thread_is_main() || G.background);
if (G.background) {
/* In the background mode the system context of the render engine might be nullptr, which
* forces some code paths which more tightly couple it with the draw manager.
* For the compositor we want to have the least amount of coupling with the draw manager, so
* ensure that the render engine has its own system GPU context. */
void *re_system_gpu_context = RE_system_gpu_context_get(&render_);
if (!re_system_gpu_context) {
/* In some cases like background mode and blocking rendering the system context of the render
* engine might be nullptr, which forces some code paths which more tightly couple it with
* the draw manager. For the compositor we want to have the least amount of coupling with the
* draw manager, so ensure that the render engine has its own system GPU context. */
RE_system_gpu_context_ensure(&render_);
re_system_gpu_context = RE_system_gpu_context_get(&render_);
}
void *re_system_gpu_context = RE_system_gpu_context_get(&render_);
void *re_blender_gpu_context = RE_blender_gpu_context_ensure(&render_);
GPU_render_begin();