Commit: 8e1dd7ed81d6a3806e2fa4eda667e9d2598541f3 Author: Sergey Sharybin Date: Fri Jan 19 14:55:53 2018 +0100 Branches: master https://developer.blender.org/rB8e1dd7ed81d6a3806e2fa4eda667e9d2598541f3
Cycles: Remove unneeded include statements Also try to move them from headers to implementation files as much as possible. =================================================================== M intern/cycles/app/cycles_xml.cpp M intern/cycles/blender/blender_python.cpp M intern/cycles/bvh/bvh_build.cpp M intern/cycles/bvh/bvh_node.cpp M intern/cycles/bvh/bvh_sort.cpp M intern/cycles/bvh/bvh_unaligned.cpp M intern/cycles/device/device.cpp M intern/cycles/device/device_memory.h M intern/cycles/device/opencl/opencl_base.cpp M intern/cycles/device/opencl/opencl_split.cpp M intern/cycles/device/opencl/opencl_util.cpp M intern/cycles/kernel/osl/osl_closures.cpp M intern/cycles/render/attribute.cpp M intern/cycles/render/buffers.cpp M intern/cycles/render/film.cpp M intern/cycles/render/graph.cpp M intern/cycles/render/sobol.cpp M intern/cycles/render/svm.cpp M intern/cycles/render/tables.cpp M intern/cycles/subd/subd_dice.cpp M intern/cycles/subd/subd_split.cpp M intern/cycles/util/util_debug.h M intern/cycles/util/util_guarded_allocator.h M intern/cycles/util/util_image_impl.h M intern/cycles/util/util_path.cpp M intern/cycles/util/util_simd.h M intern/cycles/util/util_stack_allocator.h M intern/cycles/util/util_task.cpp =================================================================== diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index f2db9271a89..2d6e63468af 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -38,7 +38,6 @@ #include "subd/subd_patch.h" #include "subd/subd_split.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_path.h" #include "util/util_transform.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index e268c9a0d35..687ddd9e7c3 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -21,6 +21,7 @@ #include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_md5.h" diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index 39e14dba3ee..c0b3d683e37 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -28,7 +28,6 @@ #include "render/curves.h" #include "util/util_algorithm.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_progress.h" diff --git a/intern/cycles/bvh/bvh_node.cpp b/intern/cycles/bvh/bvh_node.cpp index ab6df4d265d..24af919ff46 100644 --- a/intern/cycles/bvh/bvh_node.cpp +++ b/intern/cycles/bvh/bvh_node.cpp @@ -20,7 +20,6 @@ #include "bvh/bvh.h" #include "bvh/bvh_build.h" -#include "util/util_debug.h" #include "util/util_vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/bvh/bvh_sort.cpp b/intern/cycles/bvh/bvh_sort.cpp index 3a01061b285..b40bf5bb21b 100644 --- a/intern/cycles/bvh/bvh_sort.cpp +++ b/intern/cycles/bvh/bvh_sort.cpp @@ -20,7 +20,6 @@ #include "bvh/bvh_build.h" #include "util/util_algorithm.h" -#include "util/util_debug.h" #include "util/util_task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/bvh/bvh_unaligned.cpp b/intern/cycles/bvh/bvh_unaligned.cpp index b522a8f3e10..910f82137c5 100644 --- a/intern/cycles/bvh/bvh_unaligned.cpp +++ b/intern/cycles/bvh/bvh_unaligned.cpp @@ -23,7 +23,6 @@ #include "bvh_params.h" #include "util/util_boundbox.h" -#include "util/util_debug.h" #include "util/util_transform.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index a3ff5481cef..d55a999c454 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -20,7 +20,6 @@ #include "device/device.h" #include "device/device_intern.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_half.h" #include "util/util_logging.h" diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h index 2a027917066..796c898bc8d 100644 --- a/intern/cycles/device/device_memory.h +++ b/intern/cycles/device/device_memory.h @@ -21,7 +21,6 @@ * * Data types for allocating, copying and freeing device memory. */ -#include "util/util_debug.h" #include "util/util_half.h" #include "util/util_texture.h" #include "util/util_types.h" diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index fe084edc90e..7de78d413ed 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -21,6 +21,7 @@ #include "kernel/kernel_types.h" #include "util/util_algorithm.h" +#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_md5.h" diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index 2d819080674..51d3c7bb10f 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -26,6 +26,7 @@ #include "device/device_split_kernel.h" #include "util/util_algorithm.h" +#include "util/util_debug.h" #include "util/util_logging.h" #include "util/util_md5.h" #include "util/util_path.h" diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index 47d099a1f94..7db6fa0c416 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -18,6 +18,7 @@ #include "device/opencl/opencl.h" +#include "util/util_debug.h" #include "util/util_logging.h" #include "util/util_md5.h" #include "util/util_path.h" diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 597d25e9f30..608e856e019 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -36,7 +36,6 @@ #include "kernel/osl/osl_closures.h" #include "kernel/osl/osl_shader.h" -#include "util/util_debug.h" #include "util/util_math.h" #include "util/util_param.h" diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp index 9dff18691cd..95e69df6885 100644 --- a/intern/cycles/render/attribute.cpp +++ b/intern/cycles/render/attribute.cpp @@ -18,7 +18,6 @@ #include "render/mesh.h" #include "render/attribute.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_transform.h" diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 9899fa1c39c..84d10cc477e 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -19,7 +19,6 @@ #include "render/buffers.h" #include "device/device.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_hash.h" #include "util/util_image.h" diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 6c8c929c2f9..97937ac5f81 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -23,7 +23,6 @@ #include "render/tables.h" #include "util/util_algorithm.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_math.h" #include "util/util_math_cdf.h" diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 08203163d1a..56434b39da5 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -22,7 +22,6 @@ #include "render/constant_fold.h" #include "util/util_algorithm.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_queue.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/sobol.cpp b/intern/cycles/render/sobol.cpp index ce93dc8c5d5..6906667ac19 100644 --- a/intern/cycles/render/sobol.cpp +++ b/intern/cycles/render/sobol.cpp @@ -46,7 +46,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "util/util_debug.h" #include "util/util_types.h" #include "render/sobol.h" diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index db53e366d1e..b678277433b 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -23,7 +23,6 @@ #include "render/shader.h" #include "render/svm.h" -#include "util/util_debug.h" #include "util/util_logging.h" #include "util/util_foreach.h" #include "util/util_progress.h" diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp index 651ae4e21a0..536fdd0775e 100644 --- a/intern/cycles/render/tables.cpp +++ b/intern/cycles/render/tables.cpp @@ -18,7 +18,6 @@ #include "render/scene.h" #include "render/tables.h" -#include "util/util_debug.h" #include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp index fae815901ee..8c426da4acf 100644 --- a/intern/cycles/subd/subd_dice.cpp +++ b/intern/cycles/subd/subd_dice.cpp @@ -20,8 +20,6 @@ #include "subd/subd_dice.h" #include "subd/subd_patch.h" -#include "util/util_debug.h" - CCL_NAMESPACE_BEGIN /* EdgeDice Base */ diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/subd_split.cpp index 9dbfc1c4e2f..d3bed6a5c53 100644 --- a/intern/cycles/subd/subd_split.cpp +++ b/intern/cycles/subd/subd_split.cpp @@ -21,7 +21,6 @@ #include "subd/subd_patch.h" #include "subd/subd_split.h" -#include "util/util_debug.h" #include "util/util_math.h" #include "util/util_types.h" diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h index 9255279c5ab..632c6ae35e7 100644 --- a/intern/cycles/util/util_debug.h +++ b/intern/cycles/util/util_debug.h @@ -20,8 +20,6 @@ #include <cassert> #include <iostream> -#include "util/util_static_assert.h" - CCL_NAMESPACE_BEGIN /* Global storage for all sort of flags used to fine-tune behavior of particular diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h index 1abcabd5294..87c1526dee4 100644 --- a/intern/cycles/util/util_guarded_allocator.h +++ b/intern/cycles/util/util_guarded_allocator.h @@ -20,9 +20,6 @@ #include <cstddef> #include <memory> -#include "util/util_debug.h" -#include "util/util_types.h" - #ifdef WITH_BLENDER_GUARDEDALLOC # include "../../guardedalloc/MEM_guardedalloc.h" #endif diff --git a/intern/cycles/util/util_image_impl.h b/intern/cycles/util/util_image_impl.h index a0f9c66f979..751f52aaa86 100644 --- a/intern/cycles/util/util_image_impl.h +++ b/intern/cycles/util/util_image_impl.h @@ -18,7 +18,6 @@ #define __UTIL_IMAGE_IMPL_H__ #include "util/util_algorithm.h" -#include "util/util_debug.h" #include "util/util_half.h" #include "util/util_image.h" diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index bae5d5bd6d1..0e0371928ab 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include "util/util_debug.h" #include "util/util_md5.h" #include "util/util_path.h" #include "util/util_string.h" diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h index 58b3d267266..f432fd7957a 100644 --- a/intern/cycles/util/util_simd.h +++ b/intern/cycles/util/util_simd.h @@ -22,7 +22,6 @@ #include <limits> -#include "util/util_debug.h" #include "util/util_defines.h" /* SSE Intrinsics includes diff --git a/int @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs