[Bf-blender-cvs] [421dba73567] temp-lanpr-cleanup2: LANPR: Added compiler options to draw manager and editors.
YimingWu
noreply at git.blender.org
Sun Nov 3 13:30:25 CET 2019
Commit: 421dba735672539217abccdf7d8d0473fe30c558
Author: YimingWu
Date: Sun Nov 3 20:29:42 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rB421dba735672539217abccdf7d8d0473fe30c558
LANPR: Added compiler options to draw manager and editors.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/CMakeLists.txt
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index bd6c5f334a5..b28baba714d 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -133,10 +133,6 @@ set(SRC
engines/gpencil/gpencil_engine.h
engines/gpencil/gpencil_render.c
engines/gpencil/gpencil_shader_fx.c
- engines/lanpr/lanpr_dpix.c
- engines/lanpr/lanpr_engine.c
- engines/lanpr/lanpr_cpu.c
- engines/lanpr/lanpr_chain_draw.c
engines/select/select_draw_utils.c
engines/select/select_engine.c
@@ -165,7 +161,6 @@ set(SRC
engines/external/external_engine.h
engines/workbench/workbench_engine.h
engines/workbench/workbench_private.h
- engines/lanpr/lanpr_all.h
engines/select/select_engine.h
engines/select/select_private.h
)
@@ -176,6 +171,19 @@ set(LIB
bf_windowmanager
)
+if(WITH_LANPR)
+ list(APPEND INC
+ engines/lanpr
+ )
+ list(APPEND SRC
+ engines/lanpr/lanpr_dpix.c
+ engines/lanpr/lanpr_engine.c
+ engines/lanpr/lanpr_cpu.c
+ engines/lanpr/lanpr_chain_draw.c
+ )
+ add_definitions(-DWITH_LANPR)
+endif()
+
data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC)
@@ -264,21 +272,6 @@ data_to_c_simple(engines/workbench/shaders/workbench_volume_vert.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_volume_frag.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl SRC)
-data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
-
-
data_to_c_simple(modes/shaders/common_colormanagement_lib.glsl SRC)
data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
data_to_c_simple(modes/shaders/common_hair_lib.glsl SRC)
@@ -398,6 +391,22 @@ data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl SRC)
data_to_c_simple(engines/select/shaders/selection_id_3D_vert.glsl SRC)
data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC)
+if(WITH_LANPR)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
+endif()
+
list(APPEND INC
)
@@ -406,4 +415,8 @@ if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)
endif()
+if(WITH_LANPR)
+ add_definitions(-DWITH_LANPR)
+endif()
+
blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index b75053f461e..b12e61d7e61 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -89,10 +89,13 @@
#include "engines/basic/basic_engine.h"
#include "engines/workbench/workbench_engine.h"
#include "engines/external/external_engine.h"
-#include "engines/lanpr/lanpr_all.h"
#include "engines/gpencil/gpencil_engine.h"
#include "engines/select/select_engine.h"
+#ifdef WITH_LANPR
+# include "engines/lanpr/lanpr_all.h"
+#endif
+
#include "GPU_context.h"
#include "DEG_depsgraph.h"
@@ -2861,9 +2864,11 @@ void DRW_engine_register(DrawEngineType *draw_engine_type)
void DRW_engines_register(void)
{
RE_engines_register(&DRW_engine_viewport_eevee_type);
- // RE_engines_register(&DRW_engine_viewport_workbench_type); //registered as two DRW_engines
- // below.
+// RE_engines_register(&DRW_engine_viewport_workbench_type); //registered as two DRW_engines
+// below.
+#ifdef WITH_LANPR
RE_engines_register(&DRW_engine_viewport_lanpr_type);
+#endif
DRW_engine_register(&draw_engine_workbench_solid);
DRW_engine_register(&draw_engine_workbench_transparent);
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index f7d10278cfb..7fdc7b94501 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -27,7 +27,6 @@ if(WITH_BLENDER)
add_subdirectory(interface)
add_subdirectory(io)
add_subdirectory(lattice)
- add_subdirectory(lanpr)
add_subdirectory(gizmo_library)
add_subdirectory(mask)
add_subdirectory(mesh)
@@ -65,3 +64,7 @@ if(WITH_BLENDER)
endif()
add_subdirectory(datafiles)
+
+if(WITH_LANPR)
+ add_subdirectory(lanpr)
+endif()
More information about the Bf-blender-cvs
mailing list