blender
/
blender
134
402
Fork 585
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Compositor: Allow inter-operation canceling #119917

Merged
Omar Emara merged 4 commits from OmarEmaraDev/blender:gpu-compositor-better-interactivity into main 2024-04-08 16:24:09 +02:00
Conversation 2 Commits 4 Files Changed 1 +11 -2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/compositor/realtime_compositor/intern/evaluator.cc
View File

@ -32,11 +32,13 @@ void Evaluator::evaluate()
if (!is_compiled_) {
compile_and_evaluate();
is_compiled_ = true;
return;
}
for (const std::unique_ptr<Operation> &operation : operations_stream_) {
if (context_.is_canceled()) {
return;
}
operation->evaluate();
}
}
@ -68,7 +70,7 @@ void Evaluator::compile_and_evaluate()
{
derived_node_tree_ = std::make_unique<DerivedNodeTree>(context_.get_node_tree());
if (!validate_node_tree()) {
if (!validate_node_tree() || context_.is_canceled()) {
return;
}
@ -77,6 +79,11 @@ void Evaluator::compile_and_evaluate()
CompileState compile_state(schedule);
for (const DNode &node : schedule) {
if (context_.is_canceled()) {
reset();
return;
}
if (compile_state.should_compile_shader_compile_unit(node)) {
compile_and_evaluate_shader_compile_unit(compile_state);
}
@ -88,6 +95,8 @@ void Evaluator::compile_and_evaluate()
compile_and_evaluate_node(node, compile_state);
}
}
is_compiled_ = true;
}
void Evaluator::compile_and_evaluate_node(DNode node, CompileState &compile_state)