[Bf-blender-cvs] [9990792e872] master: Compositor: Rename compositor build option
Omar Emara
noreply at git.blender.org
Tue Aug 9 16:00:54 CEST 2022
Commit: 9990792e87238386375c97f431f648c1334bd587
Author: Omar Emara
Date: Tue Aug 9 15:59:56 2022 +0200
Branches: master
https://developer.blender.org/rB9990792e87238386375c97f431f648c1334bd587
Compositor: Rename compositor build option
Currently, the compositor can be disabled using the WITH_COMPOSITOR
build option. Since, we intent to always build the realtime compositor,
we need to make the distinction between both compositors clear.
So this patch renames the option to WITH_COMPOSITOR_CPU. Additionally,
the check for the option was moved inside the compositor modules' own
CMake file in preparation for the realtime compositor code.
Differential Revision: https://developer.blender.org/D15622
Reviewed By: Jeroen Bakker, Ray Molenkamp
===================================================================
M CMakeLists.txt
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_lite.cmake
M build_files/cmake/config/blender_release.cmake
M extern/CMakeLists.txt
M source/blender/CMakeLists.txt
M source/blender/compositor/CMakeLists.txt
M source/blender/editors/space_node/CMakeLists.txt
M source/blender/nodes/composite/CMakeLists.txt
M source/blender/nodes/composite/node_composite_tree.cc
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_build_options.c
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/intern/wm_init_exit.c
M tests/python/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abb430d523..9ac3e379f5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ endif()
option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON)
# Compositor
-option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_CPU "Enable the tile based CPU nodal compositor" ON)
option(WITH_OPENIMAGEDENOISE "Enable the OpenImageDenoise compositing node" ON)
option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" ON)
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index e09577ac802..27577a9fbf7 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -13,7 +13,7 @@ set(WITH_BULLET ON CACHE BOOL "" FORCE)
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
set(WITH_CODEC_FFMPEG ON CACHE BOOL "" FORCE)
set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR_CPU ON CACHE BOOL "" FORCE)
set(WITH_CYCLES ON CACHE BOOL "" FORCE)
set(WITH_CYCLES_EMBREE ON CACHE BOOL "" FORCE)
set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 5ce344d39e8..c98dfe27285 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -18,7 +18,7 @@ set(WITH_BULLET OFF CACHE BOOL "" FORCE)
set(WITH_CODEC_AVI OFF CACHE BOOL "" FORCE)
set(WITH_CODEC_FFMPEG OFF CACHE BOOL "" FORCE)
set(WITH_CODEC_SNDFILE OFF CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR_CPU OFF CACHE BOOL "" FORCE)
set(WITH_COREAUDIO OFF CACHE BOOL "" FORCE)
set(WITH_CYCLES OFF CACHE BOOL "" FORCE)
set(WITH_DRACO OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 2567e0b444a..3661b1de805 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -14,7 +14,7 @@ set(WITH_BULLET ON CACHE BOOL "" FORCE)
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
set(WITH_CODEC_FFMPEG ON CACHE BOOL "" FORCE)
set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR_CPU ON CACHE BOOL "" FORCE)
set(WITH_CYCLES ON CACHE BOOL "" FORCE)
set(WITH_CYCLES_EMBREE ON CACHE BOOL "" FORCE)
set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 35da67d05a4..4da9631d395 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -48,7 +48,7 @@ if(WITH_LZMA)
add_subdirectory(lzma)
endif()
-if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
+if(WITH_CYCLES OR WITH_COMPOSITOR_CPU OR WITH_OPENSUBDIV)
add_subdirectory(clew)
if((WITH_CYCLES_DEVICE_CUDA OR WITH_CYCLES_DEVICE_OPTIX) AND WITH_CUDA_DYNLOAD)
add_subdirectory(cuew)
@@ -96,6 +96,6 @@ if(WITH_MOD_FLUID)
add_subdirectory(mantaflow)
endif()
-if(WITH_COMPOSITOR)
+if(WITH_COMPOSITOR_CPU)
add_subdirectory(smaa_areatex)
endif()
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 8ba6e7318bb..28c15d9224c 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -151,14 +151,12 @@ add_subdirectory(io)
add_subdirectory(functions)
add_subdirectory(makesdna)
add_subdirectory(makesrna)
+add_subdirectory(compositor)
if(WITH_BLENDER_THUMBNAILER)
add_subdirectory(blendthumb)
endif()
-if(WITH_COMPOSITOR)
- add_subdirectory(compositor)
-endif()
if(WITH_IMAGE_OPENEXR)
add_subdirectory(imbuf/intern/openexr)
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 55e349423bb..c555dbafbc5 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -1,676 +1,681 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2011 Blender Foundation. All rights reserved.
-set(INC
- .
- intern
- nodes
- operations
- ../blenkernel
- ../blenlib
- ../blentranslation
- ../depsgraph
- ../imbuf
- ../makesdna
- ../makesrna
- ../nodes
- ../windowmanager
- ../nodes/composite
- ../nodes/intern
- ../render
- ../render/intern
- ../../../extern/clew/include
- ../../../intern/atomic
- ../../../intern/clog
- ../../../intern/guardedalloc
-
- # dna_type_offsets.h
- ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
- # RNA_prototypes.h
- ${CMAKE_BINARY_DIR}/source/blender/makesrna
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
- COM_compositor.h
- COM_defines.h
-
- intern/COM_BufferArea.h
- intern/COM_BufferOperation.cc
- intern/COM_BufferOperation.h
- intern/COM_BufferRange.h
- intern/COM_BuffersIterator.h
- intern/COM_CPUDevice.cc
- intern/COM_CPUDevice.h
- intern/COM_ChunkOrder.cc
- intern/COM_ChunkOrder.h
- intern/COM_ChunkOrderHotspot.cc
- intern/COM_ChunkOrderHotspot.h
- intern/COM_CompositorContext.cc
- intern/COM_CompositorContext.h
- intern/COM_ConstantFolder.cc
- intern/COM_ConstantFolder.h
- intern/COM_Converter.cc
- intern/COM_Converter.h
- intern/COM_Debug.cc
- intern/COM_Debug.h
- intern/COM_Device.cc
- intern/COM_Device.h
- intern/COM_Enums.cc
- intern/COM_Enums.h
- intern/COM_ExecutionGroup.cc
- intern/COM_ExecutionGroup.h
- intern/COM_ExecutionModel.cc
- intern/COM_ExecutionModel.h
- intern/COM_ExecutionSystem.cc
- intern/COM_ExecutionSystem.h
- intern/COM_FullFrameExecutionModel.cc
- intern/COM_FullFrameExecutionModel.h
- intern/COM_MemoryBuffer.cc
- intern/COM_MemoryBuffer.h
- intern/COM_MemoryProxy.cc
- intern/COM_MemoryProxy.h
- intern/COM_MetaData.cc
- intern/COM_MetaData.h
- intern/COM_MultiThreadedOperation.cc
- intern/COM_MultiThreadedOperation.h
- intern/COM_MultiThreadedRowOperation.cc
- intern/COM_MultiThreadedRowOperation.h
- intern/COM_Node.cc
- intern/COM_Node.h
- intern/COM_NodeConverter.cc
- intern/COM_NodeConverter.h
- intern/COM_NodeGraph.cc
- intern/COM_NodeGraph.h
- intern/COM_NodeOperation.cc
- intern/COM_NodeOperation.h
- intern/COM_NodeOperationBuilder.cc
- intern/COM_NodeOperationBuilder.h
- intern/COM_OpenCLDevice.cc
- intern/COM_OpenCLDevice.h
- intern/COM_SharedOperationBuffers.cc
- intern/COM_SharedOperationBuffers.h
- intern/COM_SingleThreadedOperation.cc
- intern/COM_SingleThreadedOperation.h
- intern/COM_TiledExecutionModel.cc
- intern/COM_TiledExecutionModel.h
- intern/COM_WorkPackage.cc
- intern/COM_WorkPackage.h
- intern/COM_WorkScheduler.cc
- intern/COM_WorkScheduler.h
- intern/COM_compositor.cc
-
- operations/COM_QualityStepHelper.cc
- operations/COM_QualityStepHelper.h
-
- # Internal nodes
- nodes/COM_SocketProxyNode.cc
- nodes/COM_SocketProxyNode.h
-
- # input nodes
- nodes/COM_BokehImageNode.cc
- nodes/COM_BokehImageNode.h
- nodes/COM_ColorNode.cc
- nodes/COM_ColorNode.h
- nodes/COM_ImageNode.cc
- nodes/COM_ImageNode.h
- nodes/COM_MaskNode.cc
- nodes/COM_MaskNode.h
- nodes/COM_MovieClipNode.cc
- nodes/COM_MovieClipNode.h
- nodes/COM_OutputFileNode.cc
- nodes/COM_OutputFileNode.h
- nodes/COM_RenderLayersNode.cc
- nodes/COM_RenderLayersNode.h
- nodes/COM_SceneTimeNode.cc
- nodes/COM_SceneTimeNode.h
- nodes/COM_SwitchNode.cc
- nodes/COM_SwitchNode.h
- nodes/COM_SwitchViewNode.cc
- nodes/COM_SwitchViewNode.h
- nodes/COM_TextureNode.cc
- nodes/COM_TextureNode.h
- nodes/COM_TimeNode.cc
- nodes/COM_TimeNode.h
- nodes/COM_ValueNode.cc
- nodes/COM_ValueNode.h
-
- # output nodes
- nodes/COM_CompositorNode.cc
- nodes/COM_CompositorNode.h
- nodes/COM_SplitViewerNode.cc
- nodes/COM_SplitViewerNode.h
- nodes/COM_ViewLevelsNode.cc
- nodes/COM_ViewLevelsNode.h
- nodes/COM_ViewerNode.cc
- nodes/COM_ViewerNode.h
- operations/COM_CalculateMeanOperation.cc
- operations/COM_CalculateMeanOperation.h
- operations/COM_CalculateStandardDeviationOperation.cc
- operations/COM_CalculateStandardDeviationOperation.h
-
- # distort nodes
- nodes/COM_FlipNode.cc
- nodes/COM_FlipNode.h
- nodes/COM_RotateNode.cc
- nodes/COM_RotateNode.h
- nodes/COM_ScaleNode.cc
- nodes/COM_ScaleNode.h
- nodes/COM_TranslateNode.cc
- nodes/COM_TranslateNode.h
-
- nodes/COM_DisplaceNode.cc
- nodes/COM_DisplaceNode.h
- nodes/COM_MapUVNode.cc
- nodes/COM_MapUVNode.h
-
- nodes/COM_ChannelMatteNode.cc
- nodes/COM_ChannelMatteNode.h
- nodes/COM_ChromaMatteNode.cc
- nodes/COM_ChromaMatteNode.h
- nodes/COM_ColorMatteNode.cc
- nodes/COM_ColorMatteNode.h
- nodes/COM_DifferenceMatteNode.cc
- nodes/COM_DifferenceMatteNode.h
- nodes/COM_DistanceMatteNode.cc
- nodes/COM_DistanceMatteNode.h
- nodes/COM_LensDistortionNode.cc
- nodes/COM_LensDistortionNode.h
- nodes/COM_LuminanceMatteNode.cc
- nodes/COM_LuminanceMatteNode.h
-
- nodes/COM_GlareNode.cc
- nodes/COM_GlareNode.h
-
- nodes/COM_SunBeamsNode.cc
- nodes/COM_SunBeamsNode.h
- operations/COM_SunBeamsOperation.cc
- operations/COM_SunBeamsOperation.h
-
- nodes/COM_CryptomatteNode.cc
- nodes/COM_CryptomatteNode.h
- operations/COM_CryptomatteOperation.cc
- operations/COM_CryptomatteOperation.h
-
- nodes/COM_CornerPinNode.cc
- nodes/COM_CornerPinNode.h
- nodes/COM_PlaneTrackDeformNode.cc
- nodes/COM_PlaneTrackDeformNode.h
-
- nodes/COM_CropNode.cc
- nodes/COM_CropNode.h
- operations/COM_CropOperation.cc
- operations/COM_CropOperation.h
-
- nodes/COM_DefocusNode.cc
- nodes/COM_DefocusNode.h
- nodes/COM_MovieDistortionNode.cc
- nodes/COM_MovieDistortionNode.h
- nodes/COM_Stabilize2dNode.cc
- nodes/COM_Stabilize2dNode.h
- nodes/COM_TransformNode.cc
- nodes/COM_TransformNode.h
-
- # color nodes
- nodes/COM_AlphaOverNode.cc
- nodes/COM_AlphaOverNode.h
- nodes/COM_BrightnessNode.cc
- nodes/COM_BrightnessNode.h
- nodes/COM_ColorBalanceNode.cc
- nodes/COM_ColorBalanceNode.h
- nodes/COM_ColorCorrectionNode.cc
- nodes/COM_ColorCorrection
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list