[Bf-blender-cvs] [a22dbfe116e] temp-viewport-compositor-compiler: Viewport Compositor: Move compiler to its own file
Omar Emara
noreply at git.blender.org
Mon Apr 11 11:16:12 CEST 2022
Commit: a22dbfe116e46fb07b865e1e3caabc0bac415003
Author: Omar Emara
Date: Mon Apr 11 11:15:27 2022 +0200
Branches: temp-viewport-compositor-compiler
https://developer.blender.org/rBa22dbfe116e46fb07b865e1e3caabc0bac415003
Viewport Compositor: Move compiler to its own file
===================================================================
M source/blender/draw/engines/compositor/compositor_engine.cc
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
M source/blender/viewport_compositor/CMakeLists.txt
R086 source/blender/viewport_compositor/VPC_compositor_execute.hh source/blender/viewport_compositor/VPC_compiler.hh
A source/blender/viewport_compositor/VPC_evaluator.hh
M source/blender/viewport_compositor/VPC_gpu_material_node.hh
M source/blender/viewport_compositor/VPC_node_operation.hh
R085 source/blender/viewport_compositor/intern/compositor_execute.cc source/blender/viewport_compositor/intern/compiler.cc
A source/blender/viewport_compositor/intern/evaluator.cc
M source/blender/viewport_compositor/intern/gpu_material_node.cc
M source/blender/viewport_compositor/intern/node_operation.cc
===================================================================
diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index f7272816d15..c1b568547c1 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -1,20 +1,5 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Copyright 2021, Blender Foundation.
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2022 Blender Foundation. All rights reserved. */
#include "BLI_math_vec_types.hh"
@@ -28,7 +13,9 @@
#include "IMB_colormanagement.h"
-#include "VPC_compositor_execute.hh"
+#include "VPC_context.hh"
+#include "VPC_evaluator.hh"
+#include "VPC_texture_pool.hh"
#include "GPU_texture.h"
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 d4b210f5e7b..1a9e19bbf0a 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -79,7 +79,7 @@ class AlphaOverGPUMaterialNode : public GPUMaterialNode {
const float premultiply_factor = get_premultiply_factor();
if (premultiply_factor != 0.0f) {
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_alpha_over_mixed",
inputs,
outputs,
@@ -88,21 +88,21 @@ class AlphaOverGPUMaterialNode : public GPUMaterialNode {
}
if (get_use_premultiply()) {
- GPU_stack_link(material, &node(), "node_composite_alpha_over_key", inputs, outputs);
+ GPU_stack_link(material, &bnode(), "node_composite_alpha_over_key", inputs, outputs);
return;
}
- GPU_stack_link(material, &node(), "node_composite_alpha_over_premultiply", inputs, outputs);
+ GPU_stack_link(material, &bnode(), "node_composite_alpha_over_premultiply", inputs, outputs);
}
bool get_use_premultiply()
{
- return node().custom1;
+ return bnode().custom1;
}
float get_premultiply_factor()
{
- return ((NodeTwoFloats *)node().storage)->x;
+ return ((NodeTwoFloats *)bnode().storage)->x;
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc
index dfad60dd688..bde0d1fcb29 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -70,7 +70,7 @@ class BrightContrastGPUMaterialNode : public GPUMaterialNode {
const float use_premultiply = get_use_premultiply();
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_bright_contrast",
inputs,
outputs,
@@ -79,7 +79,7 @@ class BrightContrastGPUMaterialNode : public GPUMaterialNode {
bool get_use_premultiply()
{
- return node().custom1;
+ return bnode().custom1;
}
};
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 a948a9d0611..9a7b17d0617 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -120,7 +120,7 @@ class ChannelMatteGPUMaterialNode : public GPUMaterialNode {
const float min_limit = get_min_limit();
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_channel_matte",
inputs,
outputs,
@@ -137,18 +137,18 @@ class ChannelMatteGPUMaterialNode : public GPUMaterialNode {
* 4 -> CMP_NODE_CHANNEL_MATTE_CS_YCC */
int get_color_space()
{
- return node().custom1;
+ return bnode().custom1;
}
/* Get the index of the channel used to generate the matte. */
int get_matte_channel()
{
- return node().custom2 - 1;
+ return bnode().custom2 - 1;
}
NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(node().storage);
+ return static_cast<NodeChroma *>(bnode().storage);
}
/* Get the index of the channel used to compute the limit value. */
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 4e9fddcdebf..9d14be2e947 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -91,7 +91,7 @@ class ChromaMatteGPUMaterialNode : public GPUMaterialNode {
const float falloff = get_falloff();
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_chroma_matte",
inputs,
outputs,
@@ -102,7 +102,7 @@ class ChromaMatteGPUMaterialNode : public GPUMaterialNode {
NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(node().storage);
+ return static_cast<NodeChroma *>(bnode().storage);
}
float get_acceptance()
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 cfac17f43f0..d22b2dd3525 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -90,7 +90,7 @@ class ColorMatteGPUMaterialNode : public GPUMaterialNode {
const float value_epsilon = get_value_epsilon();
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_color_matte",
inputs,
outputs,
@@ -101,7 +101,7 @@ class ColorMatteGPUMaterialNode : public GPUMaterialNode {
NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(node().storage);
+ return static_cast<NodeChroma *>(bnode().storage);
}
float get_hue_epsilon()
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 b2544a12cdf..355661689d6 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -126,7 +126,7 @@ class ColorSpillGPUMaterialNode : public GPUMaterialNode {
const float limit_scale = get_limit_scale();
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_color_spill",
inputs,
outputs,
@@ -139,7 +139,7 @@ class ColorSpillGPUMaterialNode : public GPUMaterialNode {
/* Get the index of the channel used for spilling. */
int get_spill_channel()
{
- return node().custom1 - 1;
+ return bnode().custom1 - 1;
}
/* Get limiting algorithm.
@@ -147,12 +147,12 @@ class ColorSpillGPUMaterialNode : public GPUMaterialNode {
* 1 -> Average. */
int get_limiting_algorithm()
{
- return node().custom2;
+ return bnode().custom2;
}
NodeColorspill *get_node_color_spill()
{
- return static_cast<NodeColorspill *>(node().storage);
+ return static_cast<NodeColorspill *>(bnode().storage);
}
void get_spill_scale(float spill_scale[3])
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
index a50cdd5f60b..63a9c4de5f5 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 "VPC_compositor_execute.hh"
+#include "VPC_gpu_material_node.hh"
#include "node_composite_util.hh"
@@ -181,7 +181,7 @@ class ColorBalanceGPUMaterialNode : public GPUMaterialNode {
if (get_color_balance_method() == 0) {
GPU_stack_link(material,
- &node(),
+ &bnode(),
"node_composite_color_balance_lgg",
inputs,
outputs,
@@ -192,7 +192,7 @@ class ColorBalanceGPUMaterialNode : public GPUMaterialNode {
}
GPU_stack_link
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list