blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

Compositor: Port redesigned Defocus node to CPU #117174

Merged
Omar Emara merged 2 commits from OmarEmaraDev/blender:refactor-cpu-defocus-node into main 2024-01-17 13:19:19 +01:00
Conversation 0 Commits 2 Files Changed 4 +11 -11
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36bc118d5e - Show all commits

8
source/blender/compositor/nodes/COM_DefocusNode.cc
View File

@ -55,6 +55,7 @@ void DefocusNode::convert_to_operations(NodeConverter &converter,
radius_op->set_scene(get_scene(context));
converter.add_operation(radius_op);
converter.map_input_socket(get_input_socket(1), radius_op->get_input_socket(0));
converter.map_input_socket(get_input_socket(0), radius_op->get_input_socket(1));
GaussianXBlurOperation *blur_x_operation = new GaussianXBlurOperation();
converter.add_operation(blur_x_operation);
@ -94,12 +95,7 @@ void DefocusNode::convert_to_operations(NodeConverter &converter,
converter.add_operation(bokeh);
VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
if (data->preview) {
operation->set_quality(eCompositorQuality::Low);
}
else {
operation->set_quality(context.get_quality());
}
operation->set_quality(eCompositorQuality::High);
operation->set_max_blur(data->maxblur);
operation->set_threshold(data->bthresh);
converter.add_operation(operation);

11
source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
View File

@ -18,13 +18,15 @@ namespace blender::compositor {
ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation()
{
this->add_input_socket(DataType::Value);
this->add_input_socket(DataType::Color);
this->add_output_socket(DataType::Value);
flags_.can_be_constant = true;
}
void ConvertDepthToRadiusOperation::init_execution()
{
input_operation_ = this->get_input_socket_reader(0);
depth_input_operation_ = this->get_input_socket_reader(0);
image_input_operation_ = this->get_input_socket_reader(1);
f_stop = get_f_stop();
focal_length = get_focal_length();
@ -55,7 +57,7 @@ void ConvertDepthToRadiusOperation::execute_pixel_sampled(float output[4],
PixelSampler sampler)
{
float input_value[4];
input_operation_->read_sampled(input_value, x, y, sampler);
depth_input_operation_->read_sampled(input_value, x, y, sampler);
const float depth = input_value[0];
/* Compute `Vu` in equation (7). */
@ -75,7 +77,7 @@ void ConvertDepthToRadiusOperation::execute_pixel_sampled(float output[4],
void ConvertDepthToRadiusOperation::deinit_execution()
{
input_operation_ = nullptr;
depth_input_operation_ = nullptr;
}
/* Given a depth texture, compute the radius of the circle of confusion in pixels based on equation
@ -164,7 +166,8 @@ float ConvertDepthToRadiusOperation::compute_focus_distance() const
* an invalid camera. Note that the stored sensor size is in millimeter, so convert to meters. */
float ConvertDepthToRadiusOperation::compute_pixels_per_meter() const
{
const int2 size = int2(get_width(), get_height());
const int2 size = int2(image_input_operation_->get_width(),
image_input_operation_->get_height());
const Camera *camera = get_camera();
const float default_value = size.x / (DEFAULT_SENSOR_WIDTH / 1000.0f);
if (!camera) {

3
source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
View File

@ -12,7 +12,8 @@ namespace blender::compositor {
class ConvertDepthToRadiusOperation : public MultiThreadedOperation {
private:
SocketReader *input_operation_;
SocketReader *depth_input_operation_;
SocketReader *image_input_operation_;
const Scene *scene_;
const NodeDefocus *data_;