From c8ac760c590aee184aba3a0fbd8110d0aad2fe97 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Mar 2020 14:15:21 +0100 Subject: Cleanup: tweak Cycles #includes in preparation for clang-format sorting --- intern/cycles/blender/blender_session.h | 6 +++++- intern/cycles/device/device_cpu.cpp | 2 ++ intern/cycles/device/device_intern.h | 6 ++++++ intern/cycles/kernel/bvh/bvh_embree.h | 3 +++ intern/cycles/kernel/closure/bsdf.h | 2 ++ intern/cycles/kernel/geom/geom.h | 2 ++ intern/cycles/kernel/kernel_path.h | 2 ++ intern/cycles/kernel/kernel_shader.h | 2 ++ intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h | 2 ++ intern/cycles/kernel/osl/background.cpp | 2 ++ intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp | 2 ++ intern/cycles/kernel/osl/bsdf_phong_ramp.cpp | 2 ++ intern/cycles/kernel/osl/emissive.cpp | 2 ++ intern/cycles/kernel/osl/osl_bssrdf.cpp | 2 ++ intern/cycles/kernel/osl/osl_closures.cpp | 2 ++ intern/cycles/kernel/osl/osl_services.cpp | 2 ++ intern/cycles/kernel/osl/osl_shader.cpp | 2 ++ intern/cycles/kernel/split/kernel_split_common.h | 2 ++ intern/cycles/kernel/split/kernel_split_data.h | 1 + intern/cycles/render/camera.cpp | 2 ++ intern/cycles/render/coverage.cpp | 7 +++++-- intern/cycles/render/coverage.h | 15 ++++++++------- intern/cycles/render/nodes.cpp | 11 ++++++----- intern/cycles/render/tables.h | 1 + intern/cycles/util/util_ssef.h | 2 ++ 25 files changed, 69 insertions(+), 15 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 2f25ec740f9..a107d526dd6 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -17,15 +17,19 @@ #ifndef __BLENDER_SESSION_H__ #define __BLENDER_SESSION_H__ +#include "RNA_blender_cpp.h" + #include "device/device.h" + +#include "render/bake.h" #include "render/scene.h" #include "render/session.h" -#include "render/bake.h" #include "util/util_vector.h" CCL_NAMESPACE_BEGIN +class BlenderSync; class ImageMetaData; class Scene; class Session; diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index cf239ec39e2..6a9671961ab 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -29,6 +29,7 @@ #include "device/device_intern.h" #include "device/device_split_kernel.h" +// clang-format off #include "kernel/kernel.h" #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_types.h" @@ -40,6 +41,7 @@ #include "kernel/osl/osl_shader.h" #include "kernel/osl/osl_globals.h" +// clang-format on #include "render/buffers.h" #include "render/coverage.h" diff --git a/intern/cycles/device/device_intern.h b/intern/cycles/device/device_intern.h index 5b8b86886c4..0c229ac24cf 100644 --- a/intern/cycles/device/device_intern.h +++ b/intern/cycles/device/device_intern.h @@ -17,9 +17,15 @@ #ifndef __DEVICE_INTERN_H__ #define __DEVICE_INTERN_H__ +#include "util/util_string.h" +#include "util/util_vector.h" + CCL_NAMESPACE_BEGIN class Device; +class DeviceInfo; +class Profiler; +class Stats; Device *device_cpu_create(DeviceInfo &info, Stats &stats, Profiler &profiler, bool background); bool device_opencl_init(); diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/bvh_embree.h index ffea7d37440..ca637288bee 100644 --- a/intern/cycles/kernel/bvh/bvh_embree.h +++ b/intern/cycles/kernel/bvh/bvh_embree.h @@ -17,9 +17,12 @@ #include #include +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data_types.h" #include "kernel/kernel_globals.h" +// clang-format on + #include "util/util_vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index b282bf5a350..0a9631ad931 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -14,6 +14,7 @@ * limitations under the License. */ +// clang-format off #include "kernel/closure/bsdf_ashikhmin_velvet.h" #include "kernel/closure/bsdf_diffuse.h" #include "kernel/closure/bsdf_oren_nayar.h" @@ -32,6 +33,7 @@ #include "kernel/closure/bsdf_principled_sheen.h" #include "kernel/closure/bssrdf.h" #include "kernel/closure/volume.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom.h b/intern/cycles/kernel/geom/geom.h index e81c1b781c8..5ff4d5f7053 100644 --- a/intern/cycles/kernel/geom/geom.h +++ b/intern/cycles/kernel/geom/geom.h @@ -14,6 +14,7 @@ * limitations under the License. */ +// clang-format off #include "kernel/geom/geom_attribute.h" #include "kernel/geom/geom_object.h" #ifdef __PATCH_EVAL__ @@ -30,3 +31,4 @@ #include "kernel/geom/geom_curve_intersect.h" #include "kernel/geom/geom_volume.h" #include "kernel/geom/geom_primitive.h" +// clang-format on diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index bdd2703a894..74377f2c069 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -18,6 +18,7 @@ # include "kernel/osl/osl_shader.h" #endif +// clang-format off #include "kernel/kernel_random.h" #include "kernel/kernel_projection.h" #include "kernel/kernel_montecarlo.h" @@ -49,6 +50,7 @@ #include "kernel/kernel_path_surface.h" #include "kernel/kernel_path_volume.h" #include "kernel/kernel_path_subsurface.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 9120fa7c3f3..9700aaba80f 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -23,10 +23,12 @@ * Release. */ +// clang-format off #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_util.h" #include "kernel/closure/bsdf.h" #include "kernel/closure/emissive.h" +// clang-format on #include "kernel/svm/svm.h" diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h index 96b2bf11132..091e53cfd83 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h @@ -20,6 +20,7 @@ * simply includes this file without worry of copying actual implementation over. */ +// clang-format off #include "kernel/kernel_compat_cpu.h" #ifndef KERNEL_STUB @@ -71,6 +72,7 @@ # include "kernel/split/kernel_data_init.h" # endif /* __SPLIT_KERNEL__ */ #endif /* KERNEL_STUB */ +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp index b395227845d..3f9de5ab33d 100644 --- a/intern/cycles/kernel/osl/background.cpp +++ b/intern/cycles/kernel/osl/background.cpp @@ -36,9 +36,11 @@ #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/closure/alloc.h" #include "kernel/closure/emissive.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp index c5edc7c9be3..76a2e41abfa 100644 --- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp @@ -37,10 +37,12 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_montecarlo.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_diffuse_ramp.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp index 4b7e59ff932..b78dc8a3a67 100644 --- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp @@ -37,9 +37,11 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_phong_ramp.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp index c29ddb13e2e..d656723bac2 100644 --- a/intern/cycles/kernel/osl/emissive.cpp +++ b/intern/cycles/kernel/osl/emissive.cpp @@ -36,10 +36,12 @@ #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/emissive.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp index dd52c33071c..c5ca8616fbd 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.cpp +++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp @@ -35,6 +35,7 @@ #include "kernel/kernel_compat_cpu.h" #include "kernel/osl/osl_closures.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_montecarlo.h" @@ -43,6 +44,7 @@ #include "kernel/closure/bsdf_diffuse.h" #include "kernel/closure/bsdf_principled_diffuse.h" #include "kernel/closure/bssrdf.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 463a65f21a0..ea5e00ec23c 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -39,6 +39,7 @@ #include "util/util_math.h" #include "util/util_param.h" +// clang-format off #include "kernel/kernel_types.h" #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data_types.h" @@ -63,6 +64,7 @@ #include "kernel/closure/bsdf_principled_diffuse.h" #include "kernel/closure/bsdf_principled_sheen.h" #include "kernel/closure/volume.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 767bd7702ae..4354226ba06 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -39,6 +39,7 @@ #include "util/util_logging.h" #include "util/util_string.h" +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data_types.h" #include "kernel/kernel_globals.h" @@ -56,6 +57,7 @@ #include "kernel/kernel_projection.h" #include "kernel/kernel_accumulate.h" #include "kernel/kernel_shader.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 0994bfaf950..2318813949e 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -16,6 +16,7 @@ #include +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_montecarlo.h" #include "kernel/kernel_types.h" @@ -28,6 +29,7 @@ #include "kernel/osl/osl_globals.h" #include "kernel/osl/osl_services.h" #include "kernel/osl/osl_shader.h" +// clang-format on #include "util/util_foreach.h" diff --git a/intern/cycles/kernel/split/kernel_split_common.h b/intern/cycles/kernel/split/kernel_split_common.h index 384bc952460..5114f2b03e5 100644 --- a/intern/cycles/kernel/split/kernel_split_common.h +++ b/intern/cycles/kernel/split/kernel_split_common.h @@ -17,6 +17,7 @@ #ifndef __KERNEL_SPLIT_H__ #define __KERNEL_SPLIT_H__ +// clang-format off #include "kernel/kernel_math.h" #include "kernel/kernel_types.h" @@ -52,6 +53,7 @@ #ifdef __BRANCHED_PATH__ # include "kernel/split/kernel_branched.h" #endif +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/split/kernel_split_data.h b/intern/cycles/kernel/split/kernel_split_data.h index 433b1221a37..decc537b39b 100644 --- a/intern/cycles/kernel/split/kernel_split_data.h +++ b/intern/cycles/kernel/split/kernel_split_data.h @@ -18,6 +18,7 @@ #define __KERNEL_SPLIT_DATA_H__ #include "kernel/split/kernel_split_data_types.h" + #include "kernel/kernel_globals.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index 14ccf6696bd..74953afae9d 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -29,6 +29,7 @@ #include "util/util_vector.h" /* needed for calculating differentials */ +// clang-format off #include "kernel/kernel_compat_cpu.h" #include "kernel/split/kernel_split_data.h" #include "kernel/kernel_globals.h" @@ -36,6 +37,7 @@ #include "kernel/kernel_differential.h" #include "kernel/kernel_montecarlo.h" #include "kernel/kernel_camera.h" +// clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/coverage.cpp b/intern/cycles/render/coverage.cpp index 0a29903728a..99d4daa6961 100644 --- a/intern/cycles/render/coverage.cpp +++ b/intern/cycles/render/coverage.cpp @@ -15,13 +15,16 @@ */ #include "render/coverage.h" +#include "render/buffers.h" + #include "kernel/kernel_compat_cpu.h" +#include "kernel/kernel_types.h" #include "kernel/split/kernel_split_data.h" + #include "kernel/kernel_globals.h" #include "kernel/kernel_id_passes.h" -#include "kernel/kernel_types.h" + #include "util/util_map.h" -#include "util/util_vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/coverage.h b/intern/cycles/render/coverage.h index 3d1f6a2b040..12182c614da 100644 --- a/intern/cycles/render/coverage.h +++ b/intern/cycles/render/coverage.h @@ -14,18 +14,19 @@ * limitations under the License. */ -#include "render/buffers.h" -#include "kernel/kernel_compat_cpu.h" -#include "kernel/split/kernel_split_data.h" -#include "kernel/kernel_globals.h" +#ifndef __COVERAGE_H__ +#define __COVERAGE_H__ + #include "util/util_map.h" #include "util/util_vector.h" -#ifndef __COVERAGE_H__ -# define __COVERAGE_H__ - CCL_NAMESPACE_BEGIN +struct KernelGlobals; +class RenderTile; + +typedef unordered_map CoverageMap; + class Coverage { public: Coverage(KernelGlobals *kg_, RenderTile &tile_) : kg(kg_), tile(tile_) diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index a52b7f0ea00..3967b4ef00e 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -23,18 +23,19 @@ #include "render/nodes.h" #include "render/scene.h" #include "render/svm.h" -#include "kernel/svm/svm_color_util.h" -#include "kernel/svm/svm_ramp_util.h" -#include "kernel/svm/svm_math_util.h" -#include "kernel/svm/svm_mapping_util.h" #include "render/osl.h" #include "render/constant_fold.h" -#include "util/util_sky_model.h" #include "util/util_foreach.h" #include "util/util_logging.h" +#include "util/util_sky_model.h" #include "util/util_transform.h" +#include "kernel/svm/svm_color_util.h" +#include "kernel/svm/svm_mapping_util.h" +#include "kernel/svm/svm_math_util.h" +#include "kernel/svm/svm_ramp_util.h" + CCL_NAMESPACE_BEGIN /* Texture Mapping */ diff --git a/intern/cycles/render/tables.h b/intern/cycles/render/tables.h index 12b59bb0aeb..3ed2959ae59 100644 --- a/intern/cycles/render/tables.h +++ b/intern/cycles/render/tables.h @@ -18,6 +18,7 @@ #define __TABLES_H__ #include "util/util_list.h" +#include "util/util_vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h index fa525daf37c..e9f0efb4efb 100644 --- a/intern/cycles/util/util_ssef.h +++ b/intern/cycles/util/util_ssef.h @@ -18,6 +18,8 @@ #ifndef __UTIL_SSEF_H__ #define __UTIL_SSEF_H__ +#include "util_ssei.h" + CCL_NAMESPACE_BEGIN #ifdef __KERNEL_SSE2__ -- cgit v1.2.3