[Bf-blender-cvs] [7f8e7c7cda8] temp-viewport-compositor-compiler: Viewport Compositor: Move into its own module
Omar Emara
noreply at git.blender.org
Fri Apr 8 18:20:25 CEST 2022
Commit: 7f8e7c7cda8d1166aacb09c5ceb02db04b55773d
Author: Omar Emara
Date: Fri Apr 8 14:35:36 2022 +0200
Branches: temp-viewport-compositor-compiler
https://developer.blender.org/rB7f8e7c7cda8d1166aacb09c5ceb02db04b55773d
Viewport Compositor: Move into its own module
This also accidentally includes refactoring of some of the components
like the scheduler.
===================================================================
M source/blender/CMakeLists.txt
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/compositor/compositor_engine.cc
M source/blender/nodes/CMakeLists.txt
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_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_crop.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
M source/blender/nodes/composite/nodes/node_composite_distance_matte.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_hue_sat_val.cc
M source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
M source/blender/nodes/composite/nodes/node_composite_image.cc
M source/blender/nodes/composite/nodes/node_composite_invert.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_value.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_normal.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_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_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_viewer.cc
A source/blender/viewport_compositor/CMakeLists.txt
R095 source/blender/nodes/NOD_compositor_execute.hh source/blender/viewport_compositor/VPC_compositor_execute.hh
A source/blender/viewport_compositor/VPC_scheduler.hh
A source/blender/viewport_compositor/VPC_utils.hh
R087 source/blender/nodes/intern/node_compositor_execute.cc source/blender/viewport_compositor/intern/compositor_execute.cc
A source/blender/viewport_compositor/intern/scheduler.cc
A source/blender/viewport_compositor/intern/utils.cc
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index c6112344208..9aa385b5f4e 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -129,6 +129,7 @@ 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/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 15c16ae457e..ca61bdd63de 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -39,6 +39,7 @@ set(INC
../nodes
../render
../render/intern
+ ../viewport_compositor
../windowmanager
../../../intern/atomic
@@ -274,6 +275,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
+ bf_viewport_compositor
bf_windowmanager
)
diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index 8211f90fef9..f7272816d15 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -28,7 +28,7 @@
#include "IMB_colormanagement.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "GPU_texture.h"
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 96b0da61c54..bbc2bd5c5b4 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -59,7 +59,6 @@ set(SRC
intern/geometry_nodes_eval_log.cc
intern/math_functions.cc
intern/node_common.cc
- intern/node_compositor_execute.cc
intern/node_declaration.cc
intern/node_exec.cc
intern/node_geometry_exec.cc
@@ -73,7 +72,6 @@ set(SRC
NOD_common.h
NOD_composite.h
- NOD_compositor_execute.hh
NOD_derived_node_tree.hh
NOD_function.h
NOD_geometry.h
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index 07ba49dbbf3..3e276bb8a2f 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -33,6 +33,7 @@ set(INC
../../makesrna
../../render
../../windowmanager
+ ../../viewport_compositor
../../../../intern/guardedalloc
# dna_type_offsets.h
@@ -137,6 +138,7 @@ set(SRC
set(LIB
bf_nodes
+ bf_viewport_compositor
)
if(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
index 504ebde7a3d..d4b210f5e7b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
@@ -26,7 +26,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc
index 09bcafc13a3..dfad60dd688 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc
@@ -26,7 +26,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
index 535f6360dc4..a948a9d0611 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
@@ -28,7 +28,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
index 082cd09c8a5..4e9fddcdebf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
@@ -28,7 +28,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
index 5b92f6fb3fb..cfac17f43f0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
@@ -26,7 +26,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
index b9d02bb4398..b2544a12cdf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
@@ -28,7 +28,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
index 0b0ac8fec9b..a50cdd5f60b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
@@ -28,7 +28,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
index 744ebabecc7..2de4b5e1270 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
@@ -28,7 +28,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc
index 5bbeee24978..72554b12162 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc
@@ -28,7 +28,7 @@
#include "GPU_texture.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc
index b0d68ddf7d7..832d045e243 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc
@@ -35,7 +35,7 @@
#include "GPU_shader.h"
#include "GPU_texture.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc
index efdbb2cfae0..5782c5f6e2d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc
@@ -30,7 +30,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
index d2ea9d6a44b..180a5b03db1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
@@ -26,7 +26,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
index 26420632ad9..2522cd7bdab 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
@@ -26,7 +26,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
index d1c541f1c05..9faceb0f1e3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
@@ -23,7 +23,7 @@
#include "GPU_material.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc
index dc8b0f02c9a..7bf296c9530 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc
@@ -28,7 +28,7 @@
#include "GPU_shader.h"
#include "GPU_texture.h"
-#include "NOD_compositor_execute.hh"
+#include "VPC_compositor_execute.hh"
#include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc
index 0e2384a8d5d..41f90bc7685 100644
--- a/source/blender/nodes/composite/nodes/node_composite_flip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc
@@ -30,7 +30,7 @
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list