[Bf-blender-cvs] [76890d8] object_nodes: Cleanup: Separate folders for compiling nodes and for executing the resulting bvm programs.
Lukas Tönne
noreply at git.blender.org
Tue Nov 24 09:43:11 CET 2015
Commit: 76890d8285e2163ede760e059a05ec610e10e4b9
Author: Lukas Tönne
Date: Tue Oct 20 10:46:10 2015 +0200
Branches: object_nodes
https://developer.blender.org/rB76890d8285e2163ede760e059a05ec610e10e4b9
Cleanup: Separate folders for compiling nodes and for executing the resulting bvm programs.
===================================================================
M build_files/cmake/macros.cmake
M source/blender/blenvm/CMakeLists.txt
A source/blender/blenvm/bvm/CMakeLists.txt
A source/blender/blenvm/bvm/bvm_eval.cc
A source/blender/blenvm/bvm/bvm_eval.h
A source/blender/blenvm/bvm/bvm_expression.cc
A source/blender/blenvm/bvm/bvm_expression.h
A source/blender/blenvm/bvm/bvm_opcode.h
A source/blender/blenvm/compile/CMakeLists.txt
A source/blender/blenvm/compile/bvm_codegen.cc
A source/blender/blenvm/compile/bvm_codegen.h
A source/blender/blenvm/compile/bvm_nodegraph.cc
A source/blender/blenvm/compile/bvm_nodegraph.h
D source/blender/blenvm/intern/bvm_codegen.cc
D source/blender/blenvm/intern/bvm_codegen.h
D source/blender/blenvm/intern/bvm_eval.cc
D source/blender/blenvm/intern/bvm_eval.h
D source/blender/blenvm/intern/bvm_expression.cc
D source/blender/blenvm/intern/bvm_expression.h
D source/blender/blenvm/intern/bvm_nodegraph.cc
D source/blender/blenvm/intern/bvm_nodegraph.h
D source/blender/blenvm/intern/bvm_opcode.h
D source/blender/blenvm/intern/bvm_type_desc.h
A source/blender/blenvm/util/bvm_util_typedesc.h
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6ae3f1c..6f8f455 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -549,6 +549,8 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_gpu
bf_blenkernel
bf_blenvm
+ bf_blenvm_bvm
+ bf_blenvm_compile
bf_physics
bf_nodes
bf_rna
diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/CMakeLists.txt
index 6964a80..05f180c 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/CMakeLists.txt
@@ -23,8 +23,13 @@
#
# ***** END GPL LICENSE BLOCK *****
+add_subdirectory(bvm)
+add_subdirectory(compile)
+
set(INC
.
+ bvm
+ compile
util
../blenkernel
../blenlib
@@ -38,27 +43,17 @@ set(INC_SYS
set(SRC
intern/bvm_api.cc
- intern/bvm_codegen.cc
- intern/bvm_eval.cc
- intern/bvm_expression.cc
intern/bvm_function.cc
- intern/bvm_module.cc
- intern/bvm_nodegraph.cc
- intern/bvm_schedule.cc
-
- intern/bvm_codegen.h
- intern/bvm_eval.h
- intern/bvm_expression.h
intern/bvm_function.h
+ intern/bvm_module.cc
intern/bvm_module.h
- intern/bvm_nodegraph.h
- intern/bvm_opcode.h
+ intern/bvm_schedule.cc
intern/bvm_schedule.h
- intern/bvm_type_desc.h
util/bvm_util_hash.h
util/bvm_util_map.h
util/bvm_util_string.h
+ util/bvm_util_typedesc.h
BVM_api.h
BVM_types.h
diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/bvm/CMakeLists.txt
similarity index 72%
copy from source/blender/blenvm/CMakeLists.txt
copy to source/blender/blenvm/bvm/CMakeLists.txt
index 6964a80..c9c481e 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/bvm/CMakeLists.txt
@@ -25,43 +25,24 @@
set(INC
.
- util
- ../blenkernel
- ../blenlib
- ../makesdna
- ../makesrna
- ../../../intern/guardedalloc
+ ..
+ ../util
+ ../../blenkernel
+ ../../blenlib
+ ../../makesdna
+ ../../makesrna
+ ../../../../intern/guardedalloc
)
set(INC_SYS
)
set(SRC
- intern/bvm_api.cc
- intern/bvm_codegen.cc
- intern/bvm_eval.cc
- intern/bvm_expression.cc
- intern/bvm_function.cc
- intern/bvm_module.cc
- intern/bvm_nodegraph.cc
- intern/bvm_schedule.cc
-
- intern/bvm_codegen.h
- intern/bvm_eval.h
- intern/bvm_expression.h
- intern/bvm_function.h
- intern/bvm_module.h
- intern/bvm_nodegraph.h
- intern/bvm_opcode.h
- intern/bvm_schedule.h
- intern/bvm_type_desc.h
-
- util/bvm_util_hash.h
- util/bvm_util_map.h
- util/bvm_util_string.h
-
- BVM_api.h
- BVM_types.h
+ bvm_eval.cc
+ bvm_eval.h
+ bvm_expression.cc
+ bvm_expression.h
+ bvm_opcode.h
)
TEST_UNORDERED_MAP_SUPPORT()
@@ -85,4 +66,4 @@ else()
endif()
endif()
-blender_add_lib(bf_blenvm "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenvm_bvm "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenvm/intern/bvm_eval.cc b/source/blender/blenvm/bvm/bvm_eval.cc
similarity index 100%
rename from source/blender/blenvm/intern/bvm_eval.cc
rename to source/blender/blenvm/bvm/bvm_eval.cc
diff --git a/source/blender/blenvm/intern/bvm_eval.h b/source/blender/blenvm/bvm/bvm_eval.h
similarity index 98%
rename from source/blender/blenvm/intern/bvm_eval.h
rename to source/blender/blenvm/bvm/bvm_eval.h
index fe4d874..6acf203 100644
--- a/source/blender/blenvm/intern/bvm_eval.h
+++ b/source/blender/blenvm/bvm/bvm_eval.h
@@ -34,10 +34,9 @@
#include <vector>
-#include "bvm_type_desc.h"
-
#include "bvm_util_map.h"
#include "bvm_util_string.h"
+#include "bvm_util_typedesc.h"
namespace bvm {
diff --git a/source/blender/blenvm/intern/bvm_expression.cc b/source/blender/blenvm/bvm/bvm_expression.cc
similarity index 100%
rename from source/blender/blenvm/intern/bvm_expression.cc
rename to source/blender/blenvm/bvm/bvm_expression.cc
diff --git a/source/blender/blenvm/intern/bvm_expression.h b/source/blender/blenvm/bvm/bvm_expression.h
similarity index 98%
rename from source/blender/blenvm/intern/bvm_expression.h
rename to source/blender/blenvm/bvm/bvm_expression.h
index c240627..ac92f54 100644
--- a/source/blender/blenvm/intern/bvm_expression.h
+++ b/source/blender/blenvm/bvm/bvm_expression.h
@@ -36,8 +36,8 @@
#include <stdint.h>
#include "bvm_opcode.h"
-#include "bvm_type_desc.h"
#include "bvm_util_string.h"
+#include "bvm_util_typedesc.h"
namespace bvm {
diff --git a/source/blender/blenvm/intern/bvm_opcode.h b/source/blender/blenvm/bvm/bvm_opcode.h
similarity index 100%
rename from source/blender/blenvm/intern/bvm_opcode.h
rename to source/blender/blenvm/bvm/bvm_opcode.h
diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/compile/CMakeLists.txt
similarity index 72%
copy from source/blender/blenvm/CMakeLists.txt
copy to source/blender/blenvm/compile/CMakeLists.txt
index 6964a80..94b58c2 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/compile/CMakeLists.txt
@@ -25,43 +25,24 @@
set(INC
.
- util
- ../blenkernel
- ../blenlib
- ../makesdna
- ../makesrna
- ../../../intern/guardedalloc
+ ..
+ ../bvm
+ ../util
+ ../../blenkernel
+ ../../blenlib
+ ../../makesdna
+ ../../makesrna
+ ../../../../intern/guardedalloc
)
set(INC_SYS
)
set(SRC
- intern/bvm_api.cc
- intern/bvm_codegen.cc
- intern/bvm_eval.cc
- intern/bvm_expression.cc
- intern/bvm_function.cc
- intern/bvm_module.cc
- intern/bvm_nodegraph.cc
- intern/bvm_schedule.cc
-
- intern/bvm_codegen.h
- intern/bvm_eval.h
- intern/bvm_expression.h
- intern/bvm_function.h
- intern/bvm_module.h
- intern/bvm_nodegraph.h
- intern/bvm_opcode.h
- intern/bvm_schedule.h
- intern/bvm_type_desc.h
-
- util/bvm_util_hash.h
- util/bvm_util_map.h
- util/bvm_util_string.h
-
- BVM_api.h
- BVM_types.h
+ bvm_codegen.cc
+ bvm_codegen.h
+ bvm_nodegraph.cc
+ bvm_nodegraph.h
)
TEST_UNORDERED_MAP_SUPPORT()
@@ -85,4 +66,4 @@ else()
endif()
endif()
-blender_add_lib(bf_blenvm "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenvm_compile "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenvm/intern/bvm_codegen.cc b/source/blender/blenvm/compile/bvm_codegen.cc
similarity index 100%
rename from source/blender/blenvm/intern/bvm_codegen.cc
rename to source/blender/blenvm/compile/bvm_codegen.cc
diff --git a/source/blender/blenvm/intern/bvm_codegen.h b/source/blender/blenvm/compile/bvm_codegen.h
similarity index 100%
rename from source/blender/blenvm/intern/bvm_codegen.h
rename to source/blender/blenvm/compile/bvm_codegen.h
diff --git a/source/blender/blenvm/intern/bvm_nodegraph.cc b/source/blender/blenvm/compile/bvm_nodegraph.cc
similarity index 100%
rename from source/blender/blenvm/intern/bvm_nodegraph.cc
rename to source/blender/blenvm/compile/bvm_nodegraph.cc
diff --git a/source/blender/blenvm/intern/bvm_nodegraph.h b/source/blender/blenvm/compile/bvm_nodegraph.h
similarity index 99%
rename from source/blender/blenvm/intern/bvm_nodegraph.h
rename to source/blender/blenvm/compile/bvm_nodegraph.h
index c376add..425f8c0 100644
--- a/source/blender/blenvm/intern/bvm_nodegraph.h
+++ b/source/blender/blenvm/compile/bvm_nodegraph.h
@@ -47,8 +47,8 @@ extern "C" {
}
#include "bvm_opcode.h"
-#include "bvm_type_desc.h"
#include "bvm_util_string.h"
+#include "bvm_util_typedesc.h"
namespace bvm {
diff --git a/source/blender/blenvm/intern/bvm_type_desc.h b/source/blender/blenvm/util/bvm_util_typedesc.h
similarity index 100%
rename from source/blender/blenvm/intern/bvm_type_desc.h
rename to source/blender/blenvm/util/bvm_util_typedesc.h
More information about the Bf-blender-cvs
mailing list