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

Fix #133847: Single value node trees fail in GPU

Browse Source 
Nodes that process single values can fail to work for GPU compositing.
That's because multi-function procedures writes to the single values but
never uploads them to the GPU, which is what this patch does.

Pull Request: https://projects.blender.org/blender/blender/pulls/133851
This commit is contained in:
Omar Emara
2025-01-31 10:10:22 +01:00
committed by Omar Emara
parent 126b3722ae
commit 3fd894a2d9
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/compositor/intern/multi_function_procedure_operation.cc
View File

@@ -127,6 +127,32 @@ static void add_single_value_output_parameter(mf::ParamsBuilder &parameter_build
}
}
/* Upload the single value output value to the GPU. The set_single_value method already does that,
* so we can call it on its own value. */
static void upload_single_value_output_to_gpu(Result &output)
{
switch (output.type()) {
case ResultType::Float:
output.set_single_value(output.get_single_value<float>());
return;
case ResultType::Int:
output.set_single_value(output.get_single_value<int>());
return;
case ResultType::Color:
output.set_single_value(output.get_single_value<float4>());
return;
case ResultType::Vector:
output.set_single_value(output.get_single_value<float4>());
return;
case ResultType::Float2:
case ResultType::Float3:
case ResultType::Int2:
/* Those types are internal and needn't be handled by operations. */
BLI_assert_unreachable();
break;
}
}
void MultiFunctionProcedureOperation::execute()
{
const Domain domain = compute_domain();
@@ -164,6 +190,16 @@ void MultiFunctionProcedureOperation::execute()
mf::ContextBuilder context_builder;
procedure_executor_->call_auto(mask, parameter_builder, context_builder);
/* In case of single value GPU execution, the single values need to be uploaded to the GPU. */
if (is_single_value && this->context().use_gpu()) {
for (int i = 0; i < procedure_.params().size(); i++) {
if (procedure_.params()[i].type == mf::ParamType::InterfaceType::Output) {
Result &output = get_result(parameter_identifiers_[i]);
upload_single_value_output_to_gpu(output);
}
}
}
}
void MultiFunctionProcedureOperation::build_procedure()