diff options
Diffstat (limited to 'source/blender/compositor/operations')
23 files changed, 41 insertions, 35 deletions
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc index aefe74a7e26..702733498c8 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc @@ -111,8 +111,6 @@ __m128 *BlurBaseOperation::convert_gausstab_sse(const float *gausstab, int size) } #endif -/* normalized distance from the current (inverted so 1.0 is close and 0.0 is far) - * 'ease' is applied after, looks nicer */ float *BlurBaseOperation::make_dist_fac_inverse(float rad, int size, int falloff) { float *dist_fac_invert, val; diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h index ab378983100..e12c5427082 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h @@ -41,6 +41,10 @@ class BlurBaseOperation : public MultiThreadedOperation, public QualityStepHelpe #ifdef BLI_HAVE_SSE2 __m128 *convert_gausstab_sse(const float *gausstab, int size); #endif + /** + * Normalized distance from the current (inverted so 1.0 is close and 0.0 is far) + * 'ease' is applied after, looks nicer. + */ float *make_dist_fac_inverse(float rad, int size, int falloff); void update_size(); diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cc b/source/blender/compositor/operations/COM_ColorCurveOperation.cc index 7cfa1c09298..bf82ae73d55 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cc @@ -45,7 +45,7 @@ void ColorCurveOperation::init_execution() input_black_program_ = this->get_input_socket_reader(2); input_white_program_ = this->get_input_socket_reader(3); - BKE_curvemapping_premultiply(curve_mapping_, 0); + BKE_curvemapping_premultiply(curve_mapping_, false); } void ColorCurveOperation::execute_pixel_sampled(float output[4], @@ -145,7 +145,7 @@ void ConstantLevelColorCurveOperation::init_execution() input_fac_program_ = this->get_input_socket_reader(0); input_image_program_ = this->get_input_socket_reader(1); - BKE_curvemapping_premultiply(curve_mapping_, 0); + BKE_curvemapping_premultiply(curve_mapping_, false); BKE_curvemapping_set_black_white(curve_mapping_, black_, white_); } diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cc b/source/blender/compositor/operations/COM_DilateErodeOperation.cc index 2abc4f71b5e..3aaf402ae24 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cc +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cc @@ -21,7 +21,6 @@ namespace blender::compositor { -/* DilateErode Distance Threshold */ DilateErodeThresholdOperation::DilateErodeThresholdOperation() { this->add_input_socket(DataType::Value); @@ -268,7 +267,6 @@ void DilateErodeThresholdOperation::update_memory_buffer_partial(MemoryBuffer *o } } -/* Dilate Distance. */ DilateDistanceOperation::DilateDistanceOperation() { this->add_input_socket(DataType::Value); @@ -458,7 +456,6 @@ void DilateDistanceOperation::update_memory_buffer_partial(MemoryBuffer *output, } } -/* Erode Distance */ ErodeDistanceOperation::ErodeDistanceOperation() : DilateDistanceOperation() { /* pass */ @@ -531,7 +528,6 @@ void ErodeDistanceOperation::update_memory_buffer_partial(MemoryBuffer *output, } } -/* Dilate step */ DilateStepOperation::DilateStepOperation() { this->add_input_socket(DataType::Value); @@ -809,7 +805,6 @@ void DilateStepOperation::update_memory_buffer_partial(MemoryBuffer *output, step_update_memory_buffer<Max2Selector>(output, inputs[0], area, iterations_, -FLT_MAX); } -/* Erode step */ ErodeStepOperation::ErodeStepOperation() : DilateStepOperation() { /* pass */ diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h index 04d25a1fca6..2ca6431862d 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.h +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h @@ -43,6 +43,7 @@ class DilateErodeThresholdOperation : public MultiThreadedOperation { int scope_; public: + /* DilateErode Distance Threshold */ DilateErodeThresholdOperation(); /** @@ -98,6 +99,7 @@ class DilateDistanceOperation : public MultiThreadedOperation { int scope_; public: + /* Dilate Distance. */ DilateDistanceOperation(); /** @@ -140,6 +142,7 @@ class DilateDistanceOperation : public MultiThreadedOperation { class ErodeDistanceOperation : public DilateDistanceOperation { public: + /* Erode Distance */ ErodeDistanceOperation(); /** @@ -169,6 +172,7 @@ class DilateStepOperation : public MultiThreadedOperation { int iterations_; public: + /* Dilate step */ DilateStepOperation(); /** @@ -205,6 +209,7 @@ class DilateStepOperation : public MultiThreadedOperation { class ErodeStepOperation : public DilateStepOperation { public: + /** Erode step. */ ErodeStepOperation(); void *initialize_tile_data(rcti *rect) override; diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc index 2d632bb3681..83bc81d35fc 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cc +++ b/source/blender/compositor/operations/COM_InpaintOperation.cc @@ -25,7 +25,6 @@ namespace blender::compositor { #define ASSERT_XY_RANGE(x, y) \ BLI_assert(x >= 0 && x < this->get_width() && y >= 0 && y < this->get_height()) -/* In-paint (simple convolve using average of known pixels). */ InpaintSimpleOperation::InpaintSimpleOperation() { this->add_input_socket(DataType::Color); diff --git a/source/blender/compositor/operations/COM_InpaintOperation.h b/source/blender/compositor/operations/COM_InpaintOperation.h index b0d44e22b85..989d154dab5 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.h +++ b/source/blender/compositor/operations/COM_InpaintOperation.h @@ -39,6 +39,7 @@ class InpaintSimpleOperation : public NodeOperation { short *manhattan_distance_; public: + /** In-paint (simple convolve using average of known pixels). */ InpaintSimpleOperation(); /** diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cc b/source/blender/compositor/operations/COM_MathBaseOperation.cc index 86993ffe887..1a4684ae3f0 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cc +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cc @@ -52,7 +52,7 @@ void MathBaseOperation::deinit_execution() void MathBaseOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) { NodeOperationInput *socket; - rcti temp_area; + rcti temp_area = COM_AREA_NONE; socket = this->get_input_socket(0); const bool determined = socket->determine_canvas(COM_AREA_NONE, temp_area); if (determined) { diff --git a/source/blender/compositor/operations/COM_MixOperation.cc b/source/blender/compositor/operations/COM_MixOperation.cc index 09bbb633459..edae4454b13 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cc +++ b/source/blender/compositor/operations/COM_MixOperation.cc @@ -70,7 +70,7 @@ void MixBaseOperation::execute_pixel_sampled(float output[4], void MixBaseOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) { NodeOperationInput *socket; - rcti temp_area; + rcti temp_area = COM_AREA_NONE; socket = this->get_input_socket(1); bool determined = socket->determine_canvas(COM_AREA_NONE, temp_area); diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h b/source/blender/compositor/operations/COM_PlaneTrackOperation.h index 4c584ca43f4..22ece04b900 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h @@ -81,7 +81,7 @@ class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTr { PlaneTrackCommon::determine_canvas(preferred_area, r_area); - rcti unused; + rcti unused = COM_AREA_NONE; rcti &preferred = r_area; NodeOperation::determine_canvas(preferred, unused); } @@ -102,7 +102,7 @@ class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation, { PlaneTrackCommon::determine_canvas(preferred_area, r_area); - rcti unused; + rcti unused = COM_AREA_NONE; rcti &preferred = r_area; NodeOperation::determine_canvas(preferred, unused); } diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc index 7650def2c87..d8e73b7c979 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cc +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc @@ -263,6 +263,7 @@ void RenderLayersProg::update_memory_buffer_partial(MemoryBuffer *output, } /* ******** Render Layers AO Operation ******** */ + void RenderLayersAOOperation::execute_pixel_sampled(float output[4], float x, float y, @@ -294,6 +295,7 @@ void RenderLayersAOOperation::update_memory_buffer_partial(MemoryBuffer *output, } /* ******** Render Layers Alpha Operation ******** */ + void RenderLayersAlphaProg::execute_pixel_sampled(float output[4], float x, float y, @@ -326,6 +328,7 @@ void RenderLayersAlphaProg::update_memory_buffer_partial(MemoryBuffer *output, } /* ******** Render Layers Depth Operation ******** */ + void RenderLayersDepthProg::execute_pixel_sampled(float output[4], float x, float y, diff --git a/source/blender/compositor/operations/COM_RotateOperation.cc b/source/blender/compositor/operations/COM_RotateOperation.cc index 8129516f81c..145a2f9c9d0 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.cc +++ b/source/blender/compositor/operations/COM_RotateOperation.cc @@ -227,7 +227,7 @@ void RotateOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) get_input_socket(IMAGE_INPUT_INDEX)->determine_canvas(preferred_area, r_area); if (image_determined) { rcti input_canvas = r_area; - rcti unused; + rcti unused = COM_AREA_NONE; get_input_socket(DEGREE_INPUT_INDEX)->determine_canvas(input_canvas, unused); ensure_degree(); diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc index ef67b6ca5f9..20e85c69ac8 100644 --- a/source/blender/compositor/operations/COM_SMAAOperation.cc +++ b/source/blender/compositor/operations/COM_SMAAOperation.cc @@ -664,9 +664,6 @@ void SMAABlendingWeightCalculationOperation::get_area_of_interest(const int UNUS /*-----------------------------------------------------------------------------*/ /* Diagonal Search Functions */ -/** - * These functions allows to perform diagonal pattern searches. - */ int SMAABlendingWeightCalculationOperation::search_diag1(int x, int y, int dir, bool *found) { float e[4]; @@ -714,9 +711,6 @@ int SMAABlendingWeightCalculationOperation::search_diag2(int x, int y, int dir, return x - dir; } -/** - * This searches for diagonal patterns and returns the corresponding weights. - */ void SMAABlendingWeightCalculationOperation::calculate_diag_weights(int x, int y, const float edges[2], diff --git a/source/blender/compositor/operations/COM_SMAAOperation.h b/source/blender/compositor/operations/COM_SMAAOperation.h index 65a88d43fdf..ec04594e0aa 100644 --- a/source/blender/compositor/operations/COM_SMAAOperation.h +++ b/source/blender/compositor/operations/COM_SMAAOperation.h @@ -111,8 +111,14 @@ class SMAABlendingWeightCalculationOperation : public MultiThreadedOperation { private: /* Diagonal Search Functions */ + /** + * These functions allows to perform diagonal pattern searches. + */ int search_diag1(int x, int y, int dir, bool *found); int search_diag2(int x, int y, int dir, bool *found); + /** + * This searches for diagonal patterns and returns the corresponding weights. + */ void calculate_diag_weights(int x, int y, const float edges[2], float weights[2]); bool is_vertical_search_unneeded(int x, int y); diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cc b/source/blender/compositor/operations/COM_ScaleOperation.cc index 350934b0d3b..281087bb4c7 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.cc +++ b/source/blender/compositor/operations/COM_ScaleOperation.cc @@ -223,7 +223,7 @@ void ScaleOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) get_input_socket(IMAGE_INPUT_INDEX)->determine_canvas(preferred_area, r_area); if (image_determined) { rcti image_canvas = r_area; - rcti unused; + rcti unused = COM_AREA_NONE; NodeOperationInput *x_socket = get_input_socket(X_INPUT_INDEX); NodeOperationInput *y_socket = get_input_socket(Y_INPUT_INDEX); x_socket->determine_canvas(image_canvas, unused); @@ -374,7 +374,6 @@ bool ScaleAbsoluteOperation::determine_depending_area_of_interest( return ScaleOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -/* Absolute fixed size. */ ScaleFixedSizeOperation::ScaleFixedSizeOperation() : BaseScaleOperation() { this->add_input_socket(DataType::Color, ResizeMode::None); @@ -503,7 +502,7 @@ void ScaleFixedSizeOperation::determine_canvas(const rcti &preferred_area, rcti rcti local_preferred = preferred_area; local_preferred.xmax = local_preferred.xmin + new_width_; local_preferred.ymax = local_preferred.ymin + new_height_; - rcti input_canvas; + rcti input_canvas = COM_AREA_NONE; const bool input_determined = get_input_socket(0)->determine_canvas(local_preferred, input_canvas); if (input_determined) { diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h index 7710aa34c54..cac865b41aa 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.h +++ b/source/blender/compositor/operations/COM_ScaleOperation.h @@ -173,6 +173,7 @@ class ScaleFixedSizeOperation : public BaseScaleOperation { bool is_offset_; public: + /** Absolute fixed size. */ ScaleFixedSizeOperation(); bool determine_depending_area_of_interest(rcti *input, ReadBufferOperation *read_operation, diff --git a/source/blender/compositor/operations/COM_SplitOperation.cc b/source/blender/compositor/operations/COM_SplitOperation.cc index e98c5c986f5..39d097b02e1 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cc +++ b/source/blender/compositor/operations/COM_SplitOperation.cc @@ -60,7 +60,7 @@ void SplitOperation::execute_pixel_sampled(float output[4], void SplitOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) { - rcti unused_area; + rcti unused_area = COM_AREA_NONE; const bool determined = this->get_input_socket(0)->determine_canvas(COM_AREA_NONE, unused_area); this->set_canvas_input_index(determined ? 0 : 1); diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc index 2ed83e87569..f5d47478a8d 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cc +++ b/source/blender/compositor/operations/COM_TextureOperation.cc @@ -80,7 +80,7 @@ void TextureBaseOperation::determine_canvas(const rcti &preferred_area, rcti &r_ if (execution_model_ == eExecutionModel::FullFrame) { /* Determine inputs. */ - rcti temp; + rcti temp = COM_AREA_NONE; NodeOperation::determine_canvas(r_area, temp); } } diff --git a/source/blender/compositor/operations/COM_TransformOperation.cc b/source/blender/compositor/operations/COM_TransformOperation.cc index be9bb32e7f0..f18e7e44094 100644 --- a/source/blender/compositor/operations/COM_TransformOperation.cc +++ b/source/blender/compositor/operations/COM_TransformOperation.cc @@ -126,7 +126,7 @@ void TransformOperation::determine_canvas(const rcti &preferred_area, rcti &r_ar get_input_socket(IMAGE_INPUT_INDEX)->determine_canvas(preferred_area, r_area); if (image_determined) { rcti image_canvas = r_area; - rcti unused; + rcti unused = COM_AREA_NONE; get_input_socket(X_INPUT_INDEX)->determine_canvas(image_canvas, unused); get_input_socket(Y_INPUT_INDEX)->determine_canvas(image_canvas, unused); get_input_socket(DEGREE_INPUT_INDEX)->determine_canvas(image_canvas, unused); @@ -171,7 +171,6 @@ void TransformOperation::determine_canvas(const rcti &preferred_area, rcti &r_ar } } -/** Translate -> Rotate -> Scale. */ void TransformOperation::transform(BuffersIterator<float> &it, const MemoryBuffer *input_img) { float rotate_center_x, rotate_center_y; @@ -198,7 +197,6 @@ void TransformOperation::transform(BuffersIterator<float> &it, const MemoryBuffe } } -/** Scale -> Rotate -> Translate. */ void TransformOperation::transform_inverted(BuffersIterator<float> &it, const MemoryBuffer *input_img) { diff --git a/source/blender/compositor/operations/COM_TransformOperation.h b/source/blender/compositor/operations/COM_TransformOperation.h index 3c5584a1bea..4db2145cc2d 100644 --- a/source/blender/compositor/operations/COM_TransformOperation.h +++ b/source/blender/compositor/operations/COM_TransformOperation.h @@ -35,9 +35,9 @@ class TransformOperation : public MultiThreadedOperation { int translate_x_; int translate_y_; float scale_; - rcti scale_canvas_; - rcti rotate_canvas_; - rcti translate_canvas_; + rcti scale_canvas_ = COM_AREA_NONE; + rcti rotate_canvas_ = COM_AREA_NONE; + rcti translate_canvas_ = COM_AREA_NONE; /* Set variables. */ PixelSampler sampler_; @@ -82,7 +82,9 @@ class TransformOperation : public MultiThreadedOperation { void determine_canvas(const rcti &preferred_area, rcti &r_area) override; private: + /** Translate -> Rotate -> Scale. */ void transform(BuffersIterator<float> &it, const MemoryBuffer *input_img); + /** Scale -> Rotate -> Translate. */ void transform_inverted(BuffersIterator<float> &it, const MemoryBuffer *input_img); }; diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cc b/source/blender/compositor/operations/COM_TranslateOperation.cc index 89c7468a67c..d3c87b09fb7 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.cc +++ b/source/blender/compositor/operations/COM_TranslateOperation.cc @@ -158,7 +158,7 @@ void TranslateCanvasOperation::determine_canvas(const rcti &preferred_area, rcti if (determined) { NodeOperationInput *x_socket = get_input_socket(X_INPUT_INDEX); NodeOperationInput *y_socket = get_input_socket(Y_INPUT_INDEX); - rcti unused; + rcti unused = COM_AREA_NONE; x_socket->determine_canvas(r_area, unused); y_socket->determine_canvas(r_area, unused); diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc index 891518d53bf..86bc6d0041a 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc @@ -69,7 +69,7 @@ void *VariableSizeBokehBlurOperation::initialize_tile_data(rcti *rect) data->bokeh = (MemoryBuffer *)input_bokeh_program_->initialize_tile_data(rect); data->size = (MemoryBuffer *)input_size_program_->initialize_tile_data(rect); - rcti rect2; + rcti rect2 = COM_AREA_NONE; this->determine_depending_area_of_interest( rect, (ReadBufferOperation *)input_size_program_, &rect2); @@ -398,7 +398,7 @@ void VariableSizeBokehBlurOperation::update_memory_buffer_partial(MemoryBuffer * p.image_width = this->get_width(); p.image_height = this->get_height(); - rcti scalar_area; + rcti scalar_area = COM_AREA_NONE; this->get_area_of_interest(SIZE_INPUT_INDEX, area, scalar_area); BLI_rcti_isect(&scalar_area, &p.size_input->get_rect(), &scalar_area); const float max_size = p.size_input->get_max_value(scalar_area); diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index b220990db76..e34b629f457 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc @@ -40,6 +40,7 @@ void zbuf_free_span(ZSpan *zspan); void antialias_tagbuf(int xsize, int ysize, char *rectmove); /* VectorBlurOperation */ + VectorBlurOperation::VectorBlurOperation() { this->add_input_socket(DataType::Color); |