1 files changed, 62 insertions, 7 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
index 9c0617ee8c3..f09bf1f5afd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
@@ -43,13 +43,13 @@ static void cmp_node_bokehblur_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Color>(N_("Image"));
 }
 
-static void node_composit_init_bokehblur(bNodeTree *UNUSED(ntree), bNode *node)
+static void node_composit_init_bokehblur(bNodeTree * /*ntree*/, bNode *node)
 {
   node->custom3 = 4.0f;
   node->custom4 = 16.0f;
 }
 
-static void node_composit_buts_bokehblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+static void node_composit_buts_bokehblur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   uiItemR(layout, ptr, "use_variable_size", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE);
   // uiItemR(layout, ptr, "f_stop", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); /* UNUSED */
@@ -70,10 +70,20 @@ class BokehBlurOperation : public NodeOperation {
       return;
     }
 
+    if (get_input("Size").is_single_value() || !get_variable_size()) {
+      execute_constant_size();
+    }
+    else {
+      execute_variable_size();
+    }
+  }
+
+  void execute_constant_size()
+  {
     GPUShader *shader = shader_manager().get("compositor_blur");
     GPU_shader_bind(shader);
 
-    GPU_shader_uniform_1i(shader, "radius", compute_blur_radius());
+    GPU_shader_uniform_1i(shader, "radius", int(compute_blur_radius()));
     GPU_shader_uniform_1b(shader, "extend_bounds", get_extend_bounds());
 
     const Result &input_image = get_input("Image");
@@ -88,7 +98,7 @@ class BokehBlurOperation : public NodeOperation {
     Domain domain = compute_domain();
     if (get_extend_bounds()) {
       /* Add a radius amount of pixels in both sides of the image, hence the multiply by 2. */
-      domain.size += int2(compute_blur_radius() * 2);
+      domain.size += int2(int(compute_blur_radius()) * 2);
     }
 
     Result &output_image = get_result("Image");
@@ -104,7 +114,42 @@ class BokehBlurOperation : public NodeOperation {
     input_mask.unbind_as_texture();
   }
 
-  int compute_blur_radius()
+  void execute_variable_size()
+  {
+    GPUShader *shader = shader_manager().get("compositor_blur_variable_size");
+    GPU_shader_bind(shader);
+
+    GPU_shader_uniform_1f(shader, "base_size", compute_blur_radius());
+    GPU_shader_uniform_1i(shader, "search_radius", get_max_size());
+
+    const Result &input_image = get_input("Image");
+    input_image.bind_as_texture(shader, "input_tx");
+
+    const Result &input_weights = get_input("Bokeh");
+    input_weights.bind_as_texture(shader, "weights_tx");
+
+    const Result &input_size = get_input("Size");
+    input_size.bind_as_texture(shader, "size_tx");
+
+    const Result &input_mask = get_input("Bounding box");
+    input_mask.bind_as_texture(shader, "mask_tx");
+
+    const Domain domain = compute_domain();
+    Result &output_image = get_result("Image");
+    output_image.allocate_texture(domain);
+    output_image.bind_as_image(shader, "output_img");
+
+    compute_dispatch_threads_at_least(shader, domain.size);
+
+    GPU_shader_unbind();
+    output_image.unbind_as_image();
+    input_image.unbind_as_texture();
+    input_weights.unbind_as_texture();
+    input_size.unbind_as_texture();
+    input_mask.unbind_as_texture();
+  }
+
+  float compute_blur_radius()
   {
     const int2 image_size = get_input("Image").domain().size;
     const int max_size = math::max(image_size.x, image_size.y);
@@ -124,7 +169,7 @@ class BokehBlurOperation : public NodeOperation {
       return true;
     }
 
-    if (compute_blur_radius() == 0) {
+    if (compute_blur_radius() == 0.0f) {
       return true;
     }
 
@@ -142,6 +187,16 @@ class BokehBlurOperation : public NodeOperation {
   {
     return bnode().custom1 & CMP_NODEFLAG_BLUR_EXTEND_BOUNDS;
   }
+
+  bool get_variable_size()
+  {
+    return bnode().custom1 & CMP_NODEFLAG_BLUR_VARIABLE_SIZE;
+  }
+
+  int get_max_size()
+  {
+    return static_cast<int>(bnode().custom4);
+  }
 };
 
 static NodeOperation *get_compositor_operation(Context &context, DNode node)
@@ -160,7 +215,7 @@ void register_node_type_cmp_bokehblur()
   cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER);
   ntype.declare = file_ns::cmp_node_bokehblur_declare;
   ntype.draw_buttons = file_ns::node_composit_buts_bokehblur;
-  node_type_init(&ntype, file_ns::node_composit_init_bokehblur);
+  ntype.initfunc = file_ns::node_composit_init_bokehblur;
   ntype.get_compositor_operation = file_ns::get_compositor_operation;
 
   nodeRegisterType(&ntype);