Commit: af0d66c16468888ef06c9942564979a47aba11e5
Author: Omar Emara
Date: Tue May 31 09:39:01 2022 +0200
Branches: temp-viewport-compositor-merge
https://developer.blender.org/rBaf0d66c16468888ef06c9942564979a47aba11e5
Realtime Compositor: Rename and move to compositor module
This patch renames the viewport compositor to realtime compositor, moves
it under the compositor module, and uses the COM prefix instead of the
VPC prefix.
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/BKE_node.h
M source/blender/compositor/CMakeLists.txt
A source/blender/compositor/realtime_compositor/CMakeLists.txt
R095 source/blender/viewport_compositor/VPC_compile_state.hh
source/blender/compositor/realtime_compositor/COM_compile_state.hh
R093 source/blender/viewport_compositor/VPC_context.hh
source/blender/compositor/realtime_compositor/COM_context.hh
R095
source/blender/viewport_compositor/VPC_conversion_processor_operation.hh
source/blender/compositor/realtime_compositor/COM_conversion_processor_operation.hh
R098 source/blender/viewport_compositor/VPC_domain.hh
source/blender/compositor/realtime_compositor/COM_domain.hh
R096 source/blender/viewport_compositor/VPC_evaluator.hh
source/blender/compositor/realtime_compositor/COM_evaluator.hh
R096 source/blender/viewport_compositor/VPC_gpu_material_node.hh
source/blender/compositor/realtime_compositor/COM_gpu_material_node.hh
R098 source/blender/viewport_compositor/VPC_gpu_material_operation.hh
source/blender/compositor/realtime_compositor/COM_gpu_material_operation.hh
R085 source/blender/viewport_compositor/VPC_input_descriptor.hh
source/blender/compositor/realtime_compositor/COM_input_descriptor.hh
R089 source/blender/viewport_compositor/VPC_input_single_value_operation.hh
source/blender/compositor/realtime_compositor/COM_input_single_value_operation.hh
R092 source/blender/viewport_compositor/VPC_node_operation.hh
source/blender/compositor/realtime_compositor/COM_node_operation.hh
R096 source/blender/viewport_compositor/VPC_operation.hh
source/blender/compositor/realtime_compositor/COM_operation.hh
R094 source/blender/viewport_compositor/VPC_processor_operation.hh
source/blender/compositor/realtime_compositor/COM_processor_operation.hh
R085
source/blender/viewport_compositor/VPC_realize_on_domain_processor_operation.hh
source/blender/compositor/realtime_compositor/COM_realize_on_domain_processor_operation.hh
R086
source/blender/viewport_compositor/VPC_reduce_to_single_value_processor_operation.hh
source/blender/compositor/realtime_compositor/COM_reduce_to_single_value_processor_operation.hh
R098 source/blender/viewport_compositor/VPC_result.hh
source/blender/compositor/realtime_compositor/COM_result.hh
R088 source/blender/viewport_compositor/VPC_scheduler.hh
source/blender/compositor/realtime_compositor/COM_scheduler.hh
R091 source/blender/viewport_compositor/VPC_shader_pool.hh
source/blender/compositor/realtime_compositor/COM_shader_pool.hh
R097 source/blender/viewport_compositor/VPC_texture_pool.hh
source/blender/compositor/realtime_compositor/COM_texture_pool.hh
R079 source/blender/viewport_compositor/VPC_unsupported_node_operation.hh
source/blender/compositor/realtime_compositor/COM_unsupported_node_operation.hh
R094 source/blender/viewport_compositor/VPC_utilities.hh
source/blender/compositor/realtime_compositor/COM_utilities.hh
R094 source/blender/viewport_compositor/intern/compile_state.cc
source/blender/compositor/realtime_compositor/intern/compile_state.cc
R078 source/blender/viewport_compositor/intern/context.cc
source/blender/compositor/realtime_compositor/intern/context.cc
R096
source/blender/viewport_compositor/intern/conversion_processor_operation.cc
source/blender/compositor/realtime_compositor/intern/conversion_processor_operation.cc
R086 source/blender/viewport_compositor/intern/domain.cc
source/blender/compositor/realtime_compositor/intern/domain.cc
R094 source/blender/viewport_compositor/intern/evaluator.cc
source/blender/compositor/realtime_compositor/intern/evaluator.cc
R096 source/blender/viewport_compositor/intern/gpu_material_node.cc
source/blender/compositor/realtime_compositor/intern/gpu_material_node.cc
R097 source/blender/viewport_compositor/intern/gpu_material_operation.cc
source/blender/compositor/realtime_compositor/intern/gpu_material_operation.cc
R088
source/blender/viewport_compositor/intern/input_single_value_operation.cc
source/blender/compositor/realtime_compositor/intern/input_single_value_operation.cc
R085 source/blender/viewport_compositor/intern/node_operation.cc
source/blender/compositor/realtime_compositor/intern/node_operation.cc
R092 source/blender/viewport_compositor/intern/operation.cc
source/blender/compositor/realtime_compositor/intern/operation.cc
R085 source/blender/viewport_compositor/intern/processor_operation.cc
source/blender/compositor/realtime_compositor/intern/processor_operation.cc
R094
source/blender/viewport_compositor/intern/realize_on_domain_processor_operation.cc
source/blender/compositor/realtime_compositor/intern/realize_on_domain_processor_operation.cc
R089
source/blender/viewport_compositor/intern/reduce_to_single_value_processor_operation.cc
source/blender/compositor/realtime_compositor/intern/reduce_to_single_value_processor_operation.cc
R097 source/blender/viewport_compositor/intern/result.cc
source/blender/compositor/realtime_compositor/intern/result.cc
R098 source/blender/viewport_compositor/intern/scheduler.cc
source/blender/compositor/realtime_compositor/intern/scheduler.cc
R081 source/blender/viewport_compositor/intern/shader_pool.cc
source/blender/compositor/realtime_compositor/intern/shader_pool.cc
R094 source/blender/viewport_compositor/intern/texture_pool.cc
source/blender/compositor/realtime_compositor/intern/texture_pool.cc
R070 source/blender/viewport_compositor/intern/unsupported_node_operation.cc
source/blender/compositor/realtime_compositor/intern/unsupported_node_operation.cc
R095 source/blender/viewport_compositor/intern/utilities.cc
source/blender/compositor/realtime_compositor/intern/utilities.cc
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/compositor/compositor_engine.cc
M source/blender/nodes/NOD_node_declaration.hh
M source/blender/nodes/composite/CMakeLists.txt
M source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
M source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
M source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
M source/blender/nodes/composite/nodes/node_composite_blur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
M source/blender/nodes/composite/nodes/node_composite_boxmask.cc
M source/blender/nodes/composite/nodes/node_composite_brightness.cc
M source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
M source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
M source/blender/nodes/composite/nodes/node_composite_color_matte.cc
M source/blender/nodes/composite/nodes/node_composite_color_spill.cc
M source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
M source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
M source/blender/nodes/composite/nodes/node_composite_composite.cc
M
source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc
M source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
M source/blender/nodes/composite/nodes/node_composite_crop.cc
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_defocus.cc
M source/blender/nodes/composite/nodes/node_composite_denoise.cc
M source/blender/nodes/composite/nodes/node_composite_despeckle.cc
M source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
M source/blender/nodes/composite/nodes/node_composite_dilate.cc
M source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
M source/blender/nodes/composite/nodes/node_composite_displace.cc
M source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
M source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc
M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
M source/blender/nodes/composite/nodes/node_composite_exposure.cc
M source/blender/nodes/composite/nodes/node_composite_filter.cc
M source/blender/nodes/composite/nodes/node_composite_flip.cc
M source/blender/nodes/composite/nodes/node_composite_gamma.cc
M source/blender/nodes/composite/nodes/node_composite_glare.cc
M source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc
M source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
M source/blender/nodes/composite/nodes/node_composite_id_mask.cc
M source/blender/nodes/composite/nodes/node_composite_image.cc
M source/blender/nodes/composite/nodes/node_composite_inpaint.cc
M source/blender/nodes/composite/nodes/node_composite_invert.cc
M source/blender/nodes/composite/nodes/node_composite_keying.cc
M source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
M source/blender/nodes/composite/nodes/node_composite_lensdist.cc
M source/blender/nodes/composite/nodes/node_composite_levels.cc
M source/blender/nodes/composite/nodes/node_composite_luma_matte.cc
M source/blender/nodes/composite/nodes/node_composite_map_range.cc
M source/blender/nodes/composite/nodes/node_composite_map_uv.cc
M source/blender/nodes/composite/nodes/node_composite_map_value.cc
M source/blender/nodes/composite/nodes/node_composite_mask.cc
M source/blender/nodes/composite/nodes/node_composite_math.cc
M source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
M source/blender/nodes/composite/nodes/node_composite_movieclip.cc
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
M source/blender/nodes/composite/nodes/node_composite_normal.cc
M source/blender/nodes/composite/nodes/node_composite_normalize.cc
M source/blender/nodes/composite/nodes/node_composite_output_file.cc
M source/blender/nodes/composite/nodes/node_composite_pixelate.cc
M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
M source/blender/nodes/composite/nodes/node_composite_posterize.cc
M source/blender/nodes/composite/nodes/node_composite_premulkey.cc
M source/blender/nodes/composite/nodes/node_composite_rgb.cc
M source/blender/nodes/composite/nodes/node_composite_rotate.cc
M source/blender/nodes/composite/nodes/node_composite_scale.cc
M source/blender/nodes/composite/nodes/node_composite_scene_time.cc
M source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc
M source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc
M source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc
M source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc
M source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc
M source/blender/nodes/composite/nodes/node_composite_setalpha.cc
M source/blender/nodes/composite/nodes/node_composite_split_viewer.cc
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
M source/blender/nodes/composite/nodes/node_composite_switch.cc
M source/blender/nodes/composite/nodes/node_composite_switchview.cc
M source/blender/nodes/composite/nodes/node_composite_texture.cc
M source/blender/nodes/composite/nodes/node_composite_tonemap.cc
M source/blender/nodes/composite/nodes/node_composite_trackpos.cc
M source/blender/nodes/composite/nodes/node_composite_transform.cc
M source/blender/nodes/composite/nodes/node_composite_translate.cc
M source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
M source/blender/nodes/composite/nodes/node_composite_value.cc
M source/blender/nodes/composite/nodes/node_composite_vec_blur.cc
M source/blender/nodes/composite/nodes/node_composite_viewer.cc
M source/blender/nodes/composite/nodes/node_composite_zcombine.cc
D source/blender/viewport_compositor/CMakeLists.txt
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 2fcc64148b8..efa2be9e48c 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -149,7 +149,6 @@ add_subdirectory(sequencer)
add_subdirectory(shader_fx)
add_subdirectory(io)
add_subdirectory(functions)
-add_subdirectory(viewport_compositor)
add_subdirectory(makesdna)
add_subdirectory(makesrna)
diff --git a/source/blender/blenkernel/BKE_node.h
b/source/blender/blenkernel/BKE_node.h
index 7c14113880b..fcc125dc20b 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -110,11 +110,11 @@ class GatherLinkSearchOpParams;
namespace fn {
class MFDataType;
} // namespace fn
-namespace viewport_compositor {
+namespace realtime_compositor {
class Context;
class NodeOperation;
class GPUMaterialNode;
-} // namespace viewport_compositor
+} // namespace realtime_compositor
} // namespace blender
using CPPTypeHandle = blender::CPPType;
@@ -129,10 +129,10 @@ using SocketGetGeometryNodesCPPValueFunction = void
(*)(const struct bNodeSocket
using NodeGatherSocketLinkOperationsFunction =
void (*)(blender::nodes::GatherLinkSearchOpParams ¶ms);
-using NodeGetCompositorOperationFunction =
blender::viewport_compositor::NodeOperation
- *(*)(blender::viewport_compositor::Context &context, blender::nodes::DNode
node);
+using NodeGetCompositorOperationFunction =
blender::realtime_compositor::NodeOperation
+ *(*)(blender::realtime_compositor::Context &context, blender::nodes::DNode
node);
using NodeGetCompositorGPUMaterialNodeFunction =
- blender::viewport_compositor::GPUMaterialNode *(*)(blender::nodes::DNode
node);
+ blender::realtime_compositor::GPUMaterialNode *(*)(blender::nodes::DNode
node);
#else
typedef void *NodeGetCompositorOperationFunction;
diff --git a/source/blender/compositor/CMakeLists.txt
b/source/blender/compositor/CMakeLists.txt
index 55e349423bb..4731f828a3f 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2011 Blender Foundation. All rights reserved.
+add_subdirectory(realtime_compositor)
+
set(INC
.
intern
diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt
b/source/blender/compositor/realtime_compositor/CMakeLists.txt
new file mode 100644
index 00000000000..e0abc9314e4
--- /dev/null
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(INC
+ .
+ ../../gpu
+ ../../nodes
+ ../../imbuf
+ ../../blenlib
+ ../../makesdna
+ ../../makesrna
+ ../../blenkernel
+ ../../gpu/intern
+ ../../../../intern/guardedalloc
+)
+
+
+set(SRC
+ intern/compile_state.cc
+ intern/context.cc
+ intern/conversion_processor_operation.cc
+ intern/domain.cc
+ intern/evaluator.cc
+ intern/gpu_material_node.cc
+ intern/gpu_material_operation.cc
+ intern/input_single_value_operation.cc
+ intern/node_operation.cc
+ intern/operation.cc
+ intern/processor_operation.cc
+ intern/realize_on_domain_processor_operation.cc
+ intern/reduce_to_single_value_processor_operation.cc
+ intern/result.cc
+ intern/scheduler.cc
+ intern/shader_pool.cc
+ intern/texture_pool.cc
+ intern/unsupported_node_operation.cc
+ intern/utilities.cc
+
+ COM_compile_state.hh
+ COM_context.hh
+ COM_conversion_processor_operation.hh
+ COM_domain.hh
+ COM_evaluator.hh
+ COM_gpu_material_node.hh
+ COM_gpu_material_operation.hh
+ COM_input_descriptor.hh
+ COM_input_single_value_operation.hh
+ COM_node_operation.hh
+ COM_operation.hh
+ COM_processor_operation.hh
+ COM_realize_on_domain_processor_operation.hh
+ COM_reduce_to_single_value_processor_operation.hh
+ COM_result.hh
+ COM_scheduler.hh
+ COM_shader_pool.hh
+ COM_texture_pool.hh
+ COM_unsupported_node_operation.hh
+ COM_utilities.hh
+)
+
+set(LIB
+ bf_gpu
+ bf_nodes
+ bf_imbuf
+ bf_blenlib
+ bf_blenkernel
+)
+
+blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/viewport_compositor/VPC_compile_state.hh
b/source/blender/compositor/realtime_compositor/COM_compile_state.hh
similarity index 95%
rename from source/blender/viewport_compositor/VPC_compile_state.hh
rename to source/blender/compositor/realtime_compositor/COM_compile_state.hh
index 25bcb01e0f8..344ae7f3923 100644
--- a/source/blender/viewport_compositor/VPC_compile_state.hh
+++ b/source/blender/compositor/realtime_compositor/COM_compile_state.hh
@@ -6,12 +6,12 @@
#include "NOD_derived_node_tree.hh"
-#include "VPC_domain.hh"
-#include "VPC_gpu_material_operation.hh"
-#include "VPC_node_operation.hh"
-#include "VPC_scheduler.hh"
+#include "COM_domain.hh"
+#include "COM_gpu_material_operation.hh"
+#include "COM_node_operation.hh"
+#include "COM_scheduler.hh"
-namespace blender::viewport_compositor {
+namespace blender::realtime_compositor {
using namespace nodes::derived_node_tree_types;
@@ -49,7 +49,7 @@ using namespace nodes::derived_node_tree_types;
* '------------'
*
* Second, it stores the GPU material compile group as well as its domain. One
should first go over
- * the discussion in VPC_evaluator.hh for a high level description of the
mechanism of the compile
+ * the discussion in COM_evaluator.hh for a high level description of the
mechanism of the compile
* group. The one important detail in this class is the
should_compile_gpu_material_compile_group
* method, which implements the criteria of whether the compile group should
be compiled given the
* node currently being processed as an argument. Those criteria are described
as follows. If the
@@ -63,7 +63,7 @@ using namespace nodes::derived_node_tree_types;
* so the group shouldn't be compiled just yet, as is the case when processing
node 4.
*
* Special attention should be given to the aforementioned domain
compatibility criterion. One
- * should first go over the discussion in VPC_domain.hh for more information
on domains. When a
+ * should first go over the discussion in COM_domain.hh for more information
on domains. When a
* compile group gets eventually compiled to a GPU material operation, that
operation will have a
* certain operation domain, and any node that gets added to the compile group
should itself have a
* computed node domain that is compatible with that operation domain,
otherwise, had the node been
@@ -114,7 +114,7 @@ class CompileState {
Map<DNode, NodeOperation *> node_operations_;
Map<DNode, GPUMaterialOperation *> gpu_material_operations_;
/* A contiguous subset of the node execution schedule that contains the
group of nodes that will
- * be compiled together into a GPU Material Operation. See the discussion in
VPC_evaluator.hh for
+ * be compiled together into a GPU Material Operation. See the discussion in
COM_evaluator.hh for
* more information. */
SubSchedule gpu_material_compile_group_;
/* The domain of the GPU material compile group. */
@@ -164,8 +164,8 @@ class CompileState {
private:
/* Compute the node domain of the given GPU material node. This is analogous
to the
* Operation::compute_domain method, except it is computed from the node
itself as opposed to a
- * compiled operation. See the discussion in VPC_domain.hh for more
information. */
+ * compiled operation. See the discussion in COM_domain.hh for more
information. */
Domain compute_gpu_material_node_domain(DNode node);
};
-} // namespace blender::viewport_compositor
+} // namespace blender::realtime_compositor
diff --git a/source/blender/viewport_compositor/VPC_context.hh
b/source/blender/compositor/realtime_compositor/COM_context.hh
similarity index 93%
rename from source/blender/viewport_compositor/VPC_context.hh
rename to source/blender/compositor/realtime_compositor/COM_context.hh
index 17ab8d04fb5..68220bb50bb 100644
--- a/source/blender/viewport_compositor/VPC_context.hh
+++ b/source/blender/compositor/realtime_compositor/COM_context.hh
@@ -9,10 +9,10 @@
#include "GPU_texture.h"
-#include "VPC_shader_pool.hh"
-#include "VPC_texture_pool.hh"
+#include "COM_shader_pool.hh"
+#include "COM_texture_pool.hh"
-namespace blender::viewport_compositor {
+namespace blender::realtime_compositor {
/*
------------------------------------------------------------------------------------------------
* Context
@@ -62,4 +62,4 @@ class Context {
ShaderPool &shader_pool();
};
-} // namespace blender::viewport_compositor
+} // namespace blender::realtime_compositor
diff --git
a/source/blender/viewport_compositor/VPC_conversion_processor_operation.hh
b/source/blender/compositor/realtime_compositor/COM_conversion_processor_operation.hh
similarity index 95%
rename from
source/blender/viewport_compositor/VPC_conversion_processor_operation.hh
rename to
source/blender/compositor/realtime_compositor/COM_conversion_processor_operation.hh
index ce96ea6da59..8e7d54e7a48 100644
--- a/source/blender/viewport_compositor/VPC_conversion_processor_operation.hh
+++
b/source/blender/compositor/realtime_compositor/COM_conversion_processor_operation.hh
@@ -4,12 +4,12 @@
#include "GPU_shader.h"
-#include "VPC_context.hh"
-#include "VPC_input_descriptor.hh"
-#include "VPC_processor_operation.hh"
-#include "VPC_result.hh"
+#include "COM_context.hh"
+#include "COM_input_descriptor.hh"
+#include "COM_processor_operation.hh"
+#include "COM_result.hh"
-namespace blender::viewport_compositor {
+namespace blender::realtime_compositor {
/*
-------------------------------------------------------------------------------------------------
* Conversion Processor Operation
@@ -123,4 +123,4 @@ class ConvertVectorToColorProcessorOperation : public
ConversionProcessorOperati
GPUShader *get_conversion_shader() const override;
};
-} // namespace blender::viewport_compositor
+} // namespace blender::realtime_compositor
diff --git a/source/blender/viewport_compositor/VPC_domain.hh
b/source/blender/compositor/realtime_compositor/COM_domain.hh
similarity index 98%
rename from source/blender/viewport_compositor/VPC_domain.hh
rename to source/blender/compositor/realtime_composi
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
