[Bf-blender-cvs] [ae862db1f40] functions-experimental-refactor: remove old function system
Jacques Lucke
noreply at git.blender.org
Thu Nov 7 15:06:12 CET 2019
Commit: ae862db1f40a3d65e98e664c7695590ea0b70556
Author: Jacques Lucke
Date: Thu Nov 7 11:54:00 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rBae862db1f40a3d65e98e664c7695590ea0b70556
remove old function system
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/fcurve.c
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
D source/blender/functions/CMakeLists.txt
D source/blender/functions/FN_all-c.h
D source/blender/functions/FN_all.hpp
D source/blender/functions/FN_core-c.h
D source/blender/functions/FN_core.hpp
D source/blender/functions/FN_cpp-c.h
D source/blender/functions/FN_cpp.hpp
D source/blender/functions/FN_data_flow_nodes-c.h
D source/blender/functions/FN_data_flow_nodes.hpp
D source/blender/functions/FN_dependencies-c.h
D source/blender/functions/FN_dependencies.hpp
D source/blender/functions/FN_functions.hpp
D source/blender/functions/FN_llvm.hpp
D source/blender/functions/FN_tuple_call-c.h
D source/blender/functions/FN_tuple_call.hpp
D source/blender/functions/FN_types-c.h
D source/blender/functions/FN_types.hpp
D source/blender/functions/backends/cpp/cpp-c.cpp
D source/blender/functions/backends/cpp/cpp-c.h
D source/blender/functions/backends/cpp/cpp_type_info.cpp
D source/blender/functions/backends/cpp/cpp_type_info.hpp
D source/blender/functions/backends/cpp/list.cpp
D source/blender/functions/backends/cpp/list.hpp
D source/blender/functions/backends/cpp/tuple.cpp
D source/blender/functions/backends/cpp/tuple.hpp
D source/blender/functions/backends/dependencies/dependencies-c.cpp
D source/blender/functions/backends/dependencies/dependencies-c.h
D source/blender/functions/backends/dependencies/dependencies.cpp
D source/blender/functions/backends/dependencies/dependencies.hpp
D source/blender/functions/backends/dependencies/fgraph_dependencies.cpp
D source/blender/functions/backends/dependencies/fgraph_dependencies.hpp
D source/blender/functions/backends/llvm/build_ir_body.cpp
D source/blender/functions/backends/llvm/build_ir_body.hpp
D source/blender/functions/backends/llvm/builder.cpp
D source/blender/functions/backends/llvm/builder.hpp
D source/blender/functions/backends/llvm/compile.cpp
D source/blender/functions/backends/llvm/compile.hpp
D source/blender/functions/backends/llvm/context_pool.cpp
D source/blender/functions/backends/llvm/context_pool.hpp
D source/blender/functions/backends/llvm/fgraph_ir_generation.cpp
D source/blender/functions/backends/llvm/fgraph_ir_generation.hpp
D source/blender/functions/backends/llvm/initialize.cpp
D source/blender/functions/backends/llvm/initialize.hpp
D source/blender/functions/backends/llvm/ir_for_tuple_call.cpp
D source/blender/functions/backends/llvm/ir_for_tuple_call.hpp
D source/blender/functions/backends/llvm/ir_to_tuple_call.cpp
D source/blender/functions/backends/llvm/ir_to_tuple_call.hpp
D source/blender/functions/backends/llvm/llvm_type_info.cpp
D source/blender/functions/backends/llvm/llvm_type_info.hpp
D source/blender/functions/backends/tuple_call/execution_context.cpp
D source/blender/functions/backends/tuple_call/execution_context.hpp
D source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
D source/blender/functions/backends/tuple_call/fgraph_tuple_call.hpp
D source/blender/functions/backends/tuple_call/lazy_to_normal.cpp
D source/blender/functions/backends/tuple_call/lazy_to_normal.hpp
D source/blender/functions/backends/tuple_call/tuple_call-c.cpp
D source/blender/functions/backends/tuple_call/tuple_call-c.h
D source/blender/functions/backends/tuple_call/tuple_call.cpp
D source/blender/functions/backends/tuple_call/tuple_call.hpp
D source/blender/functions/core/core-c.cpp
D source/blender/functions/core/core-c.h
D source/blender/functions/core/data_graph.cpp
D source/blender/functions/core/data_graph.hpp
D source/blender/functions/core/data_graph_builder.cpp
D source/blender/functions/core/data_graph_builder.hpp
D source/blender/functions/core/dot_export.cpp
D source/blender/functions/core/function.cpp
D source/blender/functions/core/function.hpp
D source/blender/functions/core/function_builder.cpp
D source/blender/functions/core/function_builder.hpp
D source/blender/functions/core/function_graph.cpp
D source/blender/functions/core/function_graph.hpp
D source/blender/functions/core/source_info.cpp
D source/blender/functions/core/source_info.hpp
D source/blender/functions/core/type.cpp
D source/blender/functions/core/type.hpp
D source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp
D source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.h
D source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
D source/blender/functions/frontends/data_flow_nodes/function_generation.hpp
D source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
D source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
D source/blender/functions/frontends/data_flow_nodes/mappings.cpp
D source/blender/functions/frontends/data_flow_nodes/mappings.hpp
D source/blender/functions/frontends/data_flow_nodes/mappings/conversion_inserters.cpp
D source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
D source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
D source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
D source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp
D source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp
D source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.hpp
D source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
D source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.hpp
D source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.cpp
D source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
D source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
D source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
D source/blender/functions/functions/array_execution.cpp
D source/blender/functions/functions/array_execution.hpp
D source/blender/functions/functions/auto_vectorization.cpp
D source/blender/functions/functions/auto_vectorization.hpp
D source/blender/functions/functions/boolean.cpp
D source/blender/functions/functions/boolean.hpp
D source/blender/functions/functions/color.cpp
D source/blender/functions/functions/color.hpp
D source/blender/functions/functions/comparisons.cpp
D source/blender/functions/functions/comparisons.hpp
D source/blender/functions/functions/constants.cpp
D source/blender/functions/functions/constants.hpp
D source/blender/functions/functions/lists.cpp
D source/blender/functions/functions/lists.hpp
D source/blender/functions/functions/object_input.cpp
D source/blender/functions/functions/object_input.hpp
D source/blender/functions/functions/random.cpp
D source/blender/functions/functions/random.hpp
D source/blender/functions/functions/ranges.cpp
D source/blender/functions/functions/ranges.hpp
D source/blender/functions/functions/scalar_math.cpp
D source/blender/functions/functions/scalar_math.hpp
D source/blender/functions/functions/simple_conversions.cpp
D source/blender/functions/functions/simple_conversions.hpp
D source/blender/functions/functions/string.cpp
D source/blender/functions/functions/string.hpp
D source/blender/functions/functions/switch.cpp
D source/blender/functions/functions/switch.hpp
D source/blender/functions/functions/vectors.cpp
D source/blender/functions/functions/vectors.hpp
D source/blender/functions/initialize.cpp
D source/blender/functions/types/boolean.cpp
D source/blender/functions/types/boolean.hpp
D source/blender/functions/types/external.cpp
D source/blender/functions/types/external.hpp
D source/blender/functions/types/initialization.cpp
D source/blender/functions/types/initialization.hpp
D source/blender/functions/types/lists.cpp
D source/blender/functions/types/lists.hpp
D source/blender/functions/types/numeric.cpp
D source/blender/functions/types/numeric.hpp
D source/blender/functions/types/string_type.cpp
D source/blender/functions/types/string_type.hpp
D source/blender/functions/types/tuple_access-c.cpp
D source/blender/functions/types/tuple_access-c.h
D source/blender/functions/types/types-c.cpp
D source/blender/functions/types/types-c.h
M source/blender/modifiers/CMakeLists.txt
M source/blender/simulations/CMakeLists.txt
M source/blender/simulations/bparticles/particle_function.cpp
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/CMakeLists.txt
M source/creator/creator.c
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 4cbc31d3f1b..5dbbfb7e619 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -111,7 +111,6 @@ add_subdirectory(nodes)
add_subdirectory(modifiers)
add_subdirectory(gpencil_modifiers)
add_subdirectory(shader_fx)
-add_subdirectory(functions)
add_subdirectory(functions2)
add_subdirectory(simulations)
add_subdirectory(makesdna)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 6b13fcea679..ce4c684282b 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
../bmesh
../depsgraph
../draw
- ../functions
../gpencil_modifiers
../gpu
../ikplugin
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index fa39b7f8ea5..5fd281af7b6 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -57,8 +57,6 @@
#include "RNA_access.h"
-#include "FN_all-c.h"
-
#include "atomic_ops.h"
#include "CLG_log.h"
@@ -1759,40 +1757,6 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
}
}
-/* evaluate 'function' driver variable */
-static float dvar_eval_function(ChannelDriver *UNUSED(driver), DriverVar *dvar)
-{
- FnFunction fn = (FnFunction)get_driver_variable_function(dvar);
- if (fn == NULL) {
- return 0.0f;
- }
-
- FnTupleCallBody body = FN_tuple_call_get(fn);
-
- FN_TUPLE_CALL_PREPARE_STACK(body, fn_in, fn_out);
-
- FN_tuple_set_int32(fn_in, 0, (int64_t)dvar);
-
- FN_tuple_call_invoke(body, fn_in, fn_out, __func__);
- float result = FN_tuple_get_float(fn_out, 0);
-
- FN_TUPLE_CALL_DESTRUCT_STACK(body, fn_in, fn_out);
-
- return result;
-}
-
-struct bNodeTree;
-void *get_driver_variable_function(DriverVar *dvar)
-{
- FnType float_ty = FN_type_get_float();
- FnType int32_ty = FN_type_get_int32();
- FnType inputs[] = {int32_ty, NULL};
- FnType outputs[] = {float_ty, NULL};
-
- struct bNodeTree *tree = (struct bNodeTree *)dvar->targets[0].id;
- return FN_function_get_with_signature(tree, inputs, outputs);
-}
-
/* Convert a quaternion to pseudo-angles representing the weighted amount of rotation. */
static void quaternion_to_angles(float quat[4], int channel)
{
@@ -1887,12 +1851,6 @@ static DriverVarTypeInfo dvar_types[MAX_DVAR_TYPES] = {
{"Object/Bone"}, /* UI names for targets */
{DTAR_FLAG_STRUCT_REF | DTAR_FLAG_ID_OB_ONLY} /* flags */
END_DVAR_TYPEDEF,
-
- BEGIN_DVAR_TYPEDEF(DVAR_TYPE_FUNCTION) dvar_eval_function, /* eval callback */
- 1, /* number of targets used */
- {"Function"}, /* UI names for targets */
- {0}, /* flags */
- END_DVAR_TYPEDEF,
};
/* Get driver variable typeinfo */
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 687924b447b..21ab148496c 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -24,7 +24,6 @@ set(INC
../blenlib
../bmesh
../draw
- ../functions
../makesdna
../makesrna
../modifiers
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 2669bce52bc..ab7f7ee74d1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -115,8 +115,6 @@ extern "C" {
#include "intern/depsgraph_type.h"
-#include "FN_dependencies.hpp"
-
namespace DEG {
/* ***************** */
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
deleted file mode 100644
index 0658650b4e3..00000000000
--- a/source/blender/functions/CMakeLists.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-set(INC
- .
- ../blenlib
- ../makesdna
- ../makesrna
- ../blenkernel
- ../depsgraph
- ../windowmanager
- ../../../intern/guardedalloc
-)
-
-set(INC_SYS
- ${LLVM_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIRS}
-)
-
-if(WITH_PYTHON)
- add_definitions(-DWITH_PYTHON)
- list(APPEND INC
- ../python
- )
-endif()
-
-set(SRC
- FN_all.hpp
- FN_core.hpp
- FN_types.hpp
- FN_functions.hpp
- FN_data_flow_nodes.hpp
-
- FN_all-c.h
- FN_core-c.h
- FN_types-c.h
- FN_dependencies-c.h
- FN_data_flow_nodes-c.h
-
- initialize.cpp
-
- core/type.hpp
- core/type.cpp
- core/function.hpp
- core/function.cpp
- core/function_builder.hpp
- core/function_builder.cpp
- core/data_graph.hpp
- core/data_graph.cpp
- core/data_graph_builder.hpp
- core/data_graph_builder.cpp
- core/function_graph.hpp
- core/function_graph.cpp
- core/source_info.hpp
- core/source_info.cpp
- core/dot_export.cpp
- core/core-c.h
- core/core-c.cpp
-
- backends/cpp/cpp_type_info.hpp
- backends/cpp/cpp_type_info.cpp
- backends/cpp/tuple.hpp
- backends/cpp/tuple.cpp
- backends/cpp/list.hpp
- backends/cpp/list.cpp
- backends/cpp/cpp-c.h
- backends/cpp/cpp-c.cpp
-
- backends/tuple_call/tuple_call.hpp
- backends/tuple_call/tuple_call.cpp
- backends/tuple_call/fgraph_tuple_call.hpp
- backends/tuple_call/fgraph_tuple_call.cpp
- backends/tuple_call/lazy_to_normal.hpp
- backends/tuple_call/lazy_to_normal.cpp
- backends/tuple_call/execution_context.hpp
- backends/tuple_call/execution_context.cpp
- backends/tuple_call/tuple_call-c.h
- backends/tuple_call/tuple_call-c.cpp
-
- backends/dependencies/dependencies.hpp
- backends/dependencies/dependencies.cpp
- backends/dependencies/fgraph_dependencies.hpp
- backends/dependencies/fgraph_dependencies.cpp
- backends/dependencies/dependencies-c.h
- backends/dependencies/dependencies-c.cpp
-
- backends/llvm/initialize.hpp
- backends/llvm/initialize.cpp
- backends/llvm/llvm_type_info.hpp
- backends/llvm/llvm_type_info.cpp
- backends/llvm/build_ir_body.hpp
- backends/llvm/build_ir_body.cpp
- backends/llvm/ir_to_tuple_call.hpp
- backends/llvm/ir_to_tuple_call.cpp
- backends/llvm/ir_for_tuple_call.hpp
- backends/llvm/ir_for_tuple_call.cpp
- backends/llvm/compile.hpp
- backends/llvm/compile.cpp
- backends/llvm/fgraph_ir_generation.hpp
- backends/llvm/fgraph_ir_generation.cpp
- backends/llvm/builder.hpp
- backends/llvm/builder.cpp
- backends/llvm/context_pool.hpp
- backends/llvm/context_pool.cpp
-
- types/initialization.hpp
- types/initialization.cpp
- types/lists.hpp
- types/lists.cpp
- types/numeric.hpp
- types/numeric.cpp
- types/boolean.hpp
- types/boolean.cpp
- types/external.hpp
- types/external.cpp
- types/string_type.hpp
- types/string_type.cpp
- types/types-c.h
- types/types-c.cpp
- types/tuple_access-c.h
- types/tuple_access-c.cpp
-
- functions/object_input.hpp
- functions/object_input.cpp
- functions/random.hpp
- functions/random.cpp
- functions/scalar_math.hpp
- functions/scalar_math.cpp
- functions/vectors.hpp
- functions/vectors.cpp
- functions/lists.hpp
- functions/lists.cpp
- functions/simple_conversions.hpp
- functions/simple_conversions.cpp
- functions/string.hpp
- functions/string.cpp
- functions/switch.hpp
- functions/switch.cpp
- functions/auto_vectorization.hpp
- functions/auto_vectorization.cpp
- functions/array_execution.hpp
- functions/array_execution.cpp
- functions/ranges.hpp
- functions/ranges.cpp
- functions/comparisons.hpp
- functions/comparisons.cpp
- functions/constants.hpp
- functions/constants.cpp
- functions/color.hpp
- functions/color.cpp
- functions/boolean.hpp
- functions/boolean.cpp
-
- frontends/data_flow_nodes/vtree_data_graph_builder.hpp
- frontends/data_flow_nodes/vtree_data_graph_builder.cpp
- frontends/data_flow_nodes/function_generation.hpp
- frontends/data_flow_nodes/function_generation.cpp
- frontends/data_flow_nodes/graph_generation.hpp
- frontends/data_flow_nodes/graph_generation.cpp
- frontends/data_flow_nodes/vtree_data_graph.hpp
- frontends/data_flow_nodes/vtree_data_graph.cpp
- frontends/data_flow_nodes/unlinked_input_inserters.hpp
- frontends/data_flow_nodes/unlinked_input_inserters.cpp
- frontends/data_flow_nodes/unlinked_input_groupers.hpp
- frontends/data_flow_nodes/unlinked_input_groupers.cpp
- frontends/data_flow_nodes/mappings.hpp
- frontends/data_flow_nodes/mappings.cpp
- frontends/data_flow_nodes/mappings/registry.hpp
- frontends/data_flow_nodes/mappings/node_inserters.cpp
- frontends/data_flow_nodes/mappings/socket_loaders.cpp
- frontends/data_flow_nodes/mappings/conversion_inserters.cpp
- frontends/data_flow_nodes/mappings/type_mappings.cpp
- frontends/data_flow_nodes/data_flow_nodes-c.h
- frontends/data_flow_nodes/data_flow_nodes-c.cpp
-)
-
-set(LIB
- bf_blenlib
-)
-
-blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/functions/FN_all-c.h b/source/blender/functions/FN_all-c.h
deleted file mode 100644
index 71f8e2ed387..00000000000
--- a/source/blender/functions/FN_all-c.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __FUNCTIONS_H__
-#define __FUNCTIONS_H__
-
-#include "FN_core-c.h"
-#include "FN_types-c.h"
-#include "FN_tuple_call-c.h"
-#include "FN_dependencies-c.h"
-#include "FN_data_flow_nodes-c.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void FN_old_initialize(void);
-void FN_old_exit(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __FUNCTIONS_H__ */
diff --git a/source/blender/functions/FN_all.hpp b/source/blender/functions/FN_all.hpp
deleted file mode 100644
index 9c81eb7ce8d..00000000000
--- a/source/blender/functions/FN_all.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "FN_all-c.h"
-#include "FN_core.hpp"
-#include "FN_types.hpp"
-#include "FN_functions.hpp"
-#include "FN_tuple_call.hpp"
-#include "FN_dependencies.hpp"
-#include "FN_data_flow_nodes.hpp"
-#include "FN_llvm.hpp"
diff --git a/source/blender/functions/FN_core-c.h b/source/blender/functions/FN_core-c.h
deleted file mode 100644
index 05508cdabcc..00000000000
--- a/source/blender/functions/FN
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list