Browse Source

Cleanup: `make format` after SortedIncludes change

master
Dalai Felinto 2 years ago
parent
commit
2d1cce8331
  1. 2
      intern/atomic/intern/atomic_ops_msvc.h
  2. 4
      intern/atomic/intern/atomic_ops_utils.h
  3. 2
      intern/audaspace/intern/AUD_PyInit.cpp
  4. 8
      intern/clog/clog.c
  5. 2
      intern/cycles/app/cycles_cubin_cc.cpp
  6. 2
      intern/cycles/app/cycles_server.cpp
  7. 4
      intern/cycles/app/cycles_standalone.cpp
  8. 4
      intern/cycles/app/cycles_xml.cpp
  9. 2
      intern/cycles/blender/blender_device.h
  10. 6
      intern/cycles/blender/blender_mesh.cpp
  11. 6
      intern/cycles/blender/blender_object.cpp
  12. 4
      intern/cycles/blender/blender_python.cpp
  13. 2
      intern/cycles/blender/blender_session.cpp
  14. 4
      intern/cycles/blender/blender_shader.cpp
  15. 6
      intern/cycles/blender/blender_sync.cpp
  16. 2
      intern/cycles/blender/blender_sync.h
  17. 2
      intern/cycles/blender/blender_texture.h
  18. 2
      intern/cycles/blender/blender_viewport.h
  19. 6
      intern/cycles/bvh/bvh_build.cpp
  20. 4
      intern/cycles/bvh/bvh_embree.cpp
  21. 2
      intern/cycles/bvh/bvh_optix.cpp
  22. 2
      intern/cycles/device/cuda/device_cuda_impl.cpp
  23. 4
      intern/cycles/device/device.cpp
  24. 2
      intern/cycles/device/device.h
  25. 2
      intern/cycles/device/device_cuda.cpp
  26. 2
      intern/cycles/device/device_memory.cpp
  27. 2
      intern/cycles/device/device_multi.cpp
  28. 2
      intern/cycles/device/device_network.cpp
  29. 6
      intern/cycles/device/device_network.h
  30. 2
      intern/cycles/device/device_opencl.cpp
  31. 14
      intern/cycles/device/device_optix.cpp
  32. 2
      intern/cycles/device/opencl/memory_manager.h
  33. 4
      intern/cycles/device/opencl/opencl_util.cpp
  34. 2
      intern/cycles/kernel/kernel.h
  35. 4
      intern/cycles/kernel/kernel_compat_cpu.h
  36. 2
      intern/cycles/kernel/kernel_globals.h
  37. 4
      intern/cycles/kernel/osl/osl_closures.h
  38. 2
      intern/cycles/kernel/osl/osl_globals.h
  39. 2
      intern/cycles/kernel/osl/osl_services.h
  40. 2
      intern/cycles/kernel/shaders/node_environment_texture.osl
  41. 2
      intern/cycles/kernel/shaders/node_fresnel.osl
  42. 2
      intern/cycles/kernel/shaders/node_glass_bsdf.osl
  43. 2
      intern/cycles/kernel/shaders/node_glossy_bsdf.osl
  44. 2
      intern/cycles/kernel/shaders/node_hsv.osl
  45. 2
      intern/cycles/kernel/shaders/node_image_texture.osl
  46. 2
      intern/cycles/kernel/shaders/node_layer_weight.osl
  47. 2
      intern/cycles/kernel/shaders/node_math.osl
  48. 2
      intern/cycles/kernel/shaders/node_mix.osl
  49. 2
      intern/cycles/kernel/shaders/node_musgrave_texture.osl
  50. 2
      intern/cycles/kernel/shaders/node_noise_texture.osl
  51. 2
      intern/cycles/kernel/shaders/node_principled_bsdf.osl
  52. 2
      intern/cycles/kernel/shaders/node_rgb_curves.osl
  53. 2
      intern/cycles/kernel/shaders/node_rgb_ramp.osl
  54. 2
      intern/cycles/kernel/shaders/node_separate_hsv.osl
  55. 2
      intern/cycles/kernel/shaders/node_sky_texture.osl
  56. 2
      intern/cycles/kernel/shaders/node_vector_curves.osl
  57. 2
      intern/cycles/kernel/shaders/node_vector_math.osl
  58. 2
      intern/cycles/kernel/shaders/node_vector_rotate.osl
  59. 2
      intern/cycles/kernel/shaders/node_velvet_bsdf.osl
  60. 2
      intern/cycles/kernel/shaders/node_voronoi_texture.osl
  61. 2
      intern/cycles/kernel/shaders/node_wave_texture.osl
  62. 2
      intern/cycles/kernel/shaders/node_white_noise_texture.osl
  63. 2
      intern/cycles/kernel/shaders/node_wireframe.osl
  64. 36
      intern/cycles/kernel/svm/svm.h
  65. 4
      intern/cycles/render/attribute.cpp
  66. 2
      intern/cycles/render/background.cpp
  67. 2
      intern/cycles/render/bake.cpp
  68. 2
      intern/cycles/render/buffers.cpp
  69. 2
      intern/cycles/render/colorspace.cpp
  70. 2
      intern/cycles/render/constant_fold.h
  71. 2
      intern/cycles/render/curves.cpp
  72. 2
      intern/cycles/render/denoising.h
  73. 4
      intern/cycles/render/film.cpp
  74. 2
      intern/cycles/render/geometry.cpp
  75. 2
      intern/cycles/render/geometry.h
  76. 4
      intern/cycles/render/graph.cpp
  77. 2
      intern/cycles/render/hair.cpp
  78. 2
      intern/cycles/render/image.cpp
  79. 4
      intern/cycles/render/integrator.cpp
  80. 8
      intern/cycles/render/light.cpp
  81. 2
      intern/cycles/render/merge.cpp
  82. 2
      intern/cycles/render/mesh.cpp
  83. 12
      intern/cycles/render/mesh_subdivision.cpp
  84. 2
      intern/cycles/render/mesh_volume.cpp
  85. 6
      intern/cycles/render/nodes.cpp
  86. 2
      intern/cycles/render/nodes.h
  87. 8
      intern/cycles/render/object.cpp
  88. 2
      intern/cycles/render/object.h
  89. 2
      intern/cycles/render/osl.cpp
  90. 2
      intern/cycles/render/particles.cpp
  91. 2
      intern/cycles/render/scene.cpp
  92. 6
      intern/cycles/render/session.cpp
  93. 2
      intern/cycles/render/session.h
  94. 2
      intern/cycles/render/shader.h
  95. 2
      intern/cycles/render/svm.cpp
  96. 2
      intern/cycles/render/tables.cpp
  97. 4
      intern/cycles/test/render_graph_finalize_test.cpp
  98. 2
      intern/cycles/test/util_avxf_test.h
  99. 2
      intern/cycles/util/util_boundbox.h
  100. 2
      intern/cycles/util/util_disjoint_set.h

2
intern/atomic/intern/atomic_ops_msvc.h

@ -37,8 +37,8 @@
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <intrin.h>
#include <windows.h>
#if defined(__clang__)
# pragma GCC diagnostic push

4
intern/atomic/intern/atomic_ops_utils.h

@ -47,10 +47,10 @@
#ifndef __ATOMIC_OPS_UTILS_H__
#define __ATOMIC_OPS_UTILS_H__
#include <stdint.h>
#include <limits.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <limits.h>
#include <assert.h>

2
intern/audaspace/intern/AUD_PyInit.cpp

@ -25,8 +25,8 @@
#include "AUD_PyInit.h"
#include <AUD_Sound.h>
#include <python/PySound.h>
#include <python/PyAPI.h>
#include <python/PySound.h>
extern "C" {
extern void *BKE_sound_get_factory(void *sound);

8
intern/clog/clog.c

@ -18,23 +18,23 @@
* \ingroup clog
*/
#include <assert.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <assert.h>
/* Disable for small single threaded programs
* to avoid having to link with pthreads. */
#ifdef WITH_CLOG_PTHREADS
# include <pthread.h>
# include "atomic_ops.h"
# include <pthread.h>
#endif
/* For 'isatty' to check for color. */
#if defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
# include <unistd.h>
# include <sys/time.h>
# include <unistd.h>
#endif
#if defined(_MSC_VER)

2
intern/cycles/app/cycles_cubin_cc.cpp

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <string>
#include <vector>

2
intern/cycles/app/cycles_server.cpp

@ -20,11 +20,11 @@
#include "util/util_args.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_path.h"
#include "util/util_stats.h"
#include "util/util_string.h"
#include "util/util_task.h"
#include "util/util_logging.h"
using namespace ccl;

4
intern/cycles/app/cycles_standalone.cpp

@ -16,12 +16,12 @@
#include <stdio.h>
#include "device/device.h"
#include "render/buffers.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/scene.h"
#include "render/session.h"
#include "render/integrator.h"
#include "util/util_args.h"
#include "util/util_foreach.h"

4
intern/cycles/app/cycles_xml.cpp

@ -16,9 +16,9 @@
#include <stdio.h>
#include <sstream>
#include <algorithm>
#include <iterator>
#include <sstream>
#include "graph/node_xml.h"
@ -32,8 +32,8 @@
#include "render/nodes.h"
#include "render/object.h"
#include "render/osl.h"
#include "render/shader.h"
#include "render/scene.h"
#include "render/shader.h"
#include "subd/subd_patch.h"
#include "subd/subd_split.h"

2
intern/cycles/blender/blender_device.h

@ -18,9 +18,9 @@
#define __BLENDER_DEVICE_H__
#include "MEM_guardedalloc.h"
#include "RNA_types.h"
#include "RNA_access.h"
#include "RNA_blender_cpp.h"
#include "RNA_types.h"
#include "device/device.h"

6
intern/cycles/blender/blender_mesh.cpp

@ -14,25 +14,25 @@
* limitations under the License.
*/
#include "render/camera.h"
#include "render/colorspace.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/camera.h"
#include "blender/blender_sync.h"
#include "blender/blender_session.h"
#include "blender/blender_sync.h"
#include "blender/blender_util.h"
#include "subd/subd_patch.h"
#include "subd/subd_split.h"
#include "util/util_algorithm.h"
#include "util/util_disjoint_set.h"
#include "util/util_foreach.h"
#include "util/util_hash.h"
#include "util/util_logging.h"
#include "util/util_math.h"
#include "util/util_disjoint_set.h"
#include "mikktspace.h"

6
intern/cycles/blender/blender_object.cpp

@ -15,14 +15,14 @@
*/
#include "render/camera.h"
#include "render/integrator.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/nodes.h"
#include "render/object.h"
#include "render/particles.h"
#include "render/scene.h"
#include "render/shader.h"
#include "blender/blender_object_cull.h"

4
intern/cycles/blender/blender_python.cpp

@ -19,8 +19,8 @@
#include "blender/CCL_api.h"
#include "blender/blender_device.h"
#include "blender/blender_sync.h"
#include "blender/blender_session.h"
#include "blender/blender_sync.h"
#include "blender/blender_util.h"
#include "render/denoising.h"
@ -38,8 +38,8 @@
#ifdef WITH_OSL
# include "render/osl.h"
# include <OSL/oslquery.h>
# include <OSL/oslconfig.h>
# include <OSL/oslquery.h>
#endif
#ifdef WITH_OPENCL

2
intern/cycles/blender/blender_session.cpp

@ -41,8 +41,8 @@
#include "util/util_progress.h"
#include "util/util_time.h"
#include "blender/blender_sync.h"
#include "blender/blender_session.h"
#include "blender/blender_sync.h"
#include "blender/blender_util.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/blender/blender_shader.cpp

@ -24,14 +24,14 @@
#include "render/shader.h"
#include "blender/blender_image.h"
#include "blender/blender_texture.h"
#include "blender/blender_sync.h"
#include "blender/blender_texture.h"
#include "blender/blender_util.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_string.h"
#include "util/util_set.h"
#include "util/util_string.h"
#include "util/util_task.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/blender/blender_sync.cpp

@ -16,6 +16,7 @@
#include "render/background.h"
#include "render/camera.h"
#include "render/curves.h"
#include "render/film.h"
#include "render/graph.h"
#include "render/integrator.h"
@ -25,19 +26,18 @@
#include "render/object.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/curves.h"
#include "device/device.h"
#include "blender/blender_device.h"
#include "blender/blender_sync.h"
#include "blender/blender_session.h"
#include "blender/blender_sync.h"
#include "blender/blender_util.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_opengl.h"
#include "util/util_hash.h"
#include "util/util_opengl.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/blender/blender_sync.h

@ -18,9 +18,9 @@
#define __BLENDER_SYNC_H__
#include "MEM_guardedalloc.h"
#include "RNA_types.h"
#include "RNA_access.h"
#include "RNA_blender_cpp.h"
#include "RNA_types.h"
#include "blender/blender_id_map.h"
#include "blender/blender_viewport.h"

2
intern/cycles/blender/blender_texture.h

@ -17,8 +17,8 @@
#ifndef __BLENDER_TEXTURE_H__
#define __BLENDER_TEXTURE_H__
#include <stdlib.h>
#include "blender/blender_sync.h"
#include <stdlib.h>
CCL_NAMESPACE_BEGIN

2
intern/cycles/blender/blender_viewport.h

@ -18,9 +18,9 @@
#define __BLENDER_VIEWPORT_H__
#include "MEM_guardedalloc.h"
#include "RNA_types.h"
#include "RNA_access.h"
#include "RNA_blender_cpp.h"
#include "RNA_types.h"
#include "render/film.h"
#include "util/util_param.h"

6
intern/cycles/bvh/bvh_build.cpp

@ -22,20 +22,20 @@
#include "bvh/bvh_params.h"
#include "bvh_split.h"
#include "render/curves.h"
#include "render/hair.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/curves.h"
#include "util/util_algorithm.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_progress.h"
#include "util/util_stack_allocator.h"
#include "util/util_queue.h"
#include "util/util_simd.h"
#include "util/util_stack_allocator.h"
#include "util/util_time.h"
#include "util/util_queue.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/bvh/bvh_embree.cpp

@ -35,9 +35,9 @@
#ifdef WITH_EMBREE
# include <embree3/rtcore_geometry.h>
# include <pmmintrin.h>
# include <xmmintrin.h>
# include <embree3/rtcore_geometry.h>
# include "bvh/bvh_embree.h"
@ -45,9 +45,9 @@
*/
# include "kernel/bvh/bvh_embree.h"
# include "kernel/kernel_compat_cpu.h"
# include "kernel/split/kernel_split_data_types.h"
# include "kernel/kernel_globals.h"
# include "kernel/kernel_random.h"
# include "kernel/split/kernel_split_data_types.h"
# include "render/hair.h"
# include "render/mesh.h"

2
intern/cycles/bvh/bvh_optix.cpp

@ -18,8 +18,8 @@
#ifdef WITH_OPTIX
# include "bvh/bvh_optix.h"
# include "render/hair.h"
# include "render/geometry.h"
# include "render/hair.h"
# include "render/mesh.h"
# include "render/object.h"
# include "util/util_foreach.h"

2
intern/cycles/device/cuda/device_cuda_impl.cpp

@ -39,8 +39,8 @@
# include "util/util_path.h"
# include "util/util_string.h"
# include "util/util_system.h"
# include "util/util_types.h"
# include "util/util_time.h"
# include "util/util_types.h"
# include "util/util_windows.h"
# include "kernel/split/kernel_split_data_types.h"

4
intern/cycles/device/device.cpp

@ -25,11 +25,11 @@
#include "util/util_logging.h"
#include "util/util_math.h"
#include "util/util_opengl.h"
#include "util/util_time.h"
#include "util/util_string.h"
#include "util/util_system.h"
#include "util/util_time.h"
#include "util/util_types.h"
#include "util/util_vector.h"
#include "util/util_string.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/device/device.h

@ -27,8 +27,8 @@
#include "util/util_list.h"
#include "util/util_stats.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_texture.h"
#include "util/util_thread.h"
#include "util/util_types.h"
#include "util/util_vector.h"

2
intern/cycles/device/device_cuda.cpp

@ -16,9 +16,9 @@
#ifdef WITH_CUDA
# include "device/cuda/device_cuda.h"
# include "device/device.h"
# include "device/device_intern.h"
# include "device/cuda/device_cuda.h"
# include "util/util_logging.h"
# include "util/util_string.h"

2
intern/cycles/device/device_memory.cpp

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "device/device.h"
#include "device/device_memory.h"
#include "device/device.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/device/device_multi.cpp

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include <stdlib.h>
#include <sstream>
#include <stdlib.h>
#include "device/device.h"
#include "device/device_intern.h"

2
intern/cycles/device/device_network.cpp

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "device/device_network.h"
#include "device/device.h"
#include "device/device_intern.h"
#include "device/device_network.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"

6
intern/cycles/device/device_network.h

@ -19,19 +19,19 @@
#ifdef WITH_NETWORK
# include <boost/archive/text_iarchive.hpp>
# include <boost/archive/text_oarchive.hpp>
# include <boost/archive/binary_iarchive.hpp>
# include <boost/archive/binary_oarchive.hpp>
# include <boost/archive/text_iarchive.hpp>
# include <boost/archive/text_oarchive.hpp>
# include <boost/array.hpp>
# include <boost/asio.hpp>
# include <boost/bind.hpp>
# include <boost/serialization/vector.hpp>
# include <boost/thread.hpp>
# include <deque>
# include <iostream>
# include <sstream>
# include <deque>
# include "render/buffers.h"

2
intern/cycles/device/device_opencl.cpp

@ -16,9 +16,9 @@
#ifdef WITH_OPENCL
# include "device/opencl/device_opencl.h"
# include "device/device.h"
# include "device/device_intern.h"
# include "device/opencl/device_opencl.h"
# include "util/util_foreach.h"
# include "util/util_logging.h"

14
intern/cycles/device/device_optix.cpp

@ -17,28 +17,28 @@
#ifdef WITH_OPTIX
# include "bvh/bvh.h"
# include "device/cuda/device_cuda.h"
# include "device/device_intern.h"
# include "device/device_denoising.h"
# include "bvh/bvh.h"
# include "render/scene.h"
# include "device/device_intern.h"
# include "render/buffers.h"
# include "render/hair.h"
# include "render/mesh.h"
# include "render/object.h"
# include "render/buffers.h"
# include "render/scene.h"
# include "util/util_debug.h"
# include "util/util_logging.h"
# include "util/util_md5.h"
# include "util/util_path.h"
# include "util/util_time.h"
# include "util/util_debug.h"
# include "util/util_logging.h"
# ifdef WITH_CUDA_DYNLOAD
# include <cuew.h>
// Do not use CUDA SDK headers when using CUEW
# define OPTIX_DONT_INCLUDE_CUDA
# endif
# include <optix_stubs.h>
# include <optix_function_table_definition.h>
# include <optix_stubs.h>
// TODO(pmours): Disable this once drivers have native support
# define OPTIX_DENOISER_NO_PIXEL_STRIDE 1

2
intern/cycles/device/opencl/memory_manager.h

@ -19,8 +19,8 @@
#include "device/device.h"
#include "util/util_map.h"
#include "util/util_vector.h"
#include "util/util_string.h"
#include "util/util_vector.h"
#include "clew.h"

4
intern/cycles/device/opencl/opencl_util.cpp

@ -16,15 +16,15 @@
#ifdef WITH_OPENCL
# include "device/opencl/device_opencl.h"
# include "device/device_intern.h"
# include "device/opencl/device_opencl.h"
# include "util/util_debug.h"
# include "util/util_logging.h"
# include "util/util_md5.h"
# include "util/util_path.h"
# include "util/util_time.h"
# include "util/util_system.h"
# include "util/util_time.h"
using std::cerr;
using std::endl;

2
intern/cycles/kernel/kernel.h

@ -19,8 +19,8 @@
/* CPU Kernel Interface */
#include "util/util_types.h"
#include "kernel/kernel_types.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/kernel/kernel_compat_cpu.h

@ -35,11 +35,11 @@
# define __NODES_FEATURES__ NODE_FEATURE_ALL
#endif
#include "util/util_half.h"
#include "util/util_math.h"
#include "util/util_simd.h"
#include "util/util_half.h"
#include "util/util_types.h"
#include "util/util_texture.h"
#include "util/util_types.h"
#define ccl_addr_space

2
intern/cycles/kernel/kernel_globals.h

@ -22,8 +22,8 @@
#include "kernel/kernel_profiling.h"
#ifdef __KERNEL_CPU__
# include "util/util_vector.h"
# include "util/util_map.h"
# include "util/util_vector.h"
#endif
#ifdef __KERNEL_OPENCL__

4
intern/cycles/kernel/osl/osl_closures.h

@ -33,12 +33,12 @@
#ifndef __OSL_CLOSURES_H__
#define __OSL_CLOSURES_H__
#include "util/util_types.h"
#include "kernel/kernel_types.h"
#include "util/util_types.h"
#include <OSL/genclosure.h>
#include <OSL/oslclosure.h>
#include <OSL/oslexec.h>
#include <OSL/genclosure.h>
CCL_NAMESPACE_BEGIN

2
intern/cycles/kernel/osl/osl_globals.h

@ -27,8 +27,8 @@
# include "util/util_map.h"
# include "util/util_param.h"
# include "util/util_thread.h"
# include "util/util_vector.h"
# include "util/util_unique_ptr.h"
# include "util/util_vector.h"
# ifndef WIN32
using std::isfinite;

2
intern/cycles/kernel/osl/osl_services.h

@ -25,8 +25,8 @@
* attributes.
*/
#include <OSL/oslexec.h>
#include <OSL/oslclosure.h>
#include <OSL/oslexec.h>
#ifdef WITH_PTEX
class PtexCache;

2
intern/cycles/kernel/shaders/node_environment_texture.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
vector environment_texture_direction_to_equirectangular(vector dir)
{

2
intern/cycles/kernel/shaders/node_fresnel.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_fresnel(float IOR = 1.45, normal Normal = N, output float Fac = 0.0)
{

2
intern/cycles/kernel/shaders/node_glass_bsdf.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_glass_bsdf(color Color = 0.8,
string distribution = "sharp",

2
intern/cycles/kernel/shaders/node_glossy_bsdf.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_glossy_bsdf(color Color = 0.8,
string distribution = "GGX",

2
intern/cycles/kernel/shaders/node_hsv.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
shader node_hsv(float Hue = 0.5,
float Saturation = 1.0,

2
intern/cycles/kernel/shaders/node_image_texture.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
point texco_remap_square(point co)
{

2
intern/cycles/kernel/shaders/node_layer_weight.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_layer_weight(float Blend = 0.5,
normal Normal = N,

2
intern/cycles/kernel/shaders/node_math.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_math.h"
#include "stdcycles.h"
/* OSL asin, acos, and pow functions are safe by default. */
shader node_math(string type = "add",

2
intern/cycles/kernel/shaders/node_mix.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
color node_mix_blend(float t, color col1, color col2)
{

2
intern/cycles/kernel/shaders/node_musgrave_texture.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_noise.h"
#include "stdcycles.h"
#include "vector2.h"
#include "vector4.h"

2
intern/cycles/kernel/shaders/node_noise_texture.osl

@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "node_noise.h"
#include "stdcycles.h"
#include "vector2.h"
#include "vector4.h"
#include "node_noise.h"
#define vector3 point

2
intern/cycles/kernel/shaders/node_principled_bsdf.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_principled_bsdf(string distribution = "Multiscatter GGX",
string subsurface_method = "burley",

2
intern/cycles/kernel/shaders/node_rgb_curves.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_ramp_util.h"
#include "stdcycles.h"
shader node_rgb_curves(color ramp[] = {0.0},
float min_x = 0.0,

2
intern/cycles/kernel/shaders/node_rgb_ramp.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_ramp_util.h"
#include "stdcycles.h"
shader node_rgb_ramp(color ramp_color[] = {0.0},
float ramp_alpha[] = {0.0},

2
intern/cycles/kernel/shaders/node_separate_hsv.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
shader node_separate_hsv(color Color = 0.8,
output float H = 0.0,

2
intern/cycles/kernel/shaders/node_sky_texture.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_color.h"
#include "stdcycles.h"
float sky_angle_between(float thetav, float phiv, float theta, float phi)
{

2
intern/cycles/kernel/shaders/node_vector_curves.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_ramp_util.h"
#include "stdcycles.h"
shader node_vector_curves(color ramp[] = {0.0},
float min_x = 0.0,

2
intern/cycles/kernel/shaders/node_vector_math.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_math.h"
#include "stdcycles.h"
shader node_vector_math(string type = "add",
vector Vector1 = vector(0.0, 0.0, 0.0),

2
intern/cycles/kernel/shaders/node_vector_rotate.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_math.h"
#include "stdcycles.h"
shader node_vector_rotate(int invert = 0,
string type = "axis",

2
intern/cycles/kernel/shaders/node_velvet_bsdf.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_fresnel.h"
#include "stdcycles.h"
shader node_velvet_bsdf(color Color = 0.8,
float Sigma = 0.0,

2
intern/cycles/kernel/shaders/node_voronoi_texture.osl

@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "node_hash.h"
#include "stdcycles.h"
#include "vector2.h"
#include "vector4.h"
#include "node_hash.h"
#define vector3 point

2
intern/cycles/kernel/shaders/node_wave_texture.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "node_noise.h"
#include "stdcycles.h"
/* Wave */

2
intern/cycles/kernel/shaders/node_white_noise_texture.osl

@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "node_hash.h"
#include "stdcycles.h"
#include "vector2.h"
#include "vector4.h"
#include "node_hash.h"
#define vector3 point

2
intern/cycles/kernel/shaders/node_wireframe.osl

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "stdcycles.h"
#include "oslutil.h"
#include "stdcycles.h"
shader node_wireframe(string bump_offset = "center",
int use_pixel_size = 0,

36
intern/cycles/kernel/svm/svm.h

@ -161,53 +161,53 @@ CCL_NAMESPACE_END
#include "svm_fractal_noise.h"
#include "kernel/svm/svm_color_util.h"
#include "kernel/svm/svm_math_util.h"
#include "kernel/svm/svm_mapping_util.h"
#include "kernel/svm/svm_math_util.h"
#include "kernel/svm/svm_aov.h"
#include "kernel/svm/svm_attribute.h"
#include "kernel/svm/svm_gradient.h"
#include "kernel/svm/svm_blackbody.h"
#include "kernel/svm/svm_brick.h"
#include "kernel/svm/svm_brightness.h"
#include "kernel/svm/svm_bump.h"
#include "kernel/svm/svm_camera.h"
#include "kernel/svm/svm_checker.h"
#include "kernel/svm/svm_clamp.h"
#include "kernel/svm/svm_closure.h"
#include "kernel/svm/svm_noisetex.h"
#include "kernel/svm/svm_convert.h"
#include "kernel/svm/svm_displace.h"
#include "kernel/svm/svm_fresnel.h"
#include "kernel/svm/svm_wireframe.h"
#include "kernel/svm/svm_wavelength.h"
#include "kernel/svm/svm_camera.h"
#include "kernel/svm/svm_gamma.h"
#include "kernel/svm/svm_geometry.h"
#include "kernel/svm/svm_gradient.h"
#include "kernel/svm/svm_hsv.h"
#include "kernel/svm/svm_ies.h"
#include "kernel/svm/svm_image.h"
#include "kernel/svm/svm_gamma.h"
#include "kernel/svm/svm_brightness.h"
#include "kernel/svm/svm_invert.h"
#include "kernel/svm/svm_light_path.h"
#include "kernel/svm/svm_magic.h"
#include "kernel/svm/svm_map_range.h"
#include "kernel/svm/svm_mapping.h"
#include "kernel/svm/svm_normal.h"
#include "kernel/svm/svm_wave.h"
#include "kernel/svm/svm_math.h"
#include "kernel/svm/svm_mix.h"
#include "kernel/svm/svm_musgrave.h"
#include "kernel/svm/svm_noisetex.h"
#include "kernel/svm/svm_normal.h"
#include "kernel/svm/svm_ramp.h"
#include "kernel/svm/svm_sepcomb_hsv.h"
#include "kernel/svm/svm_sepcomb_vector.h"
#include "kernel/svm/svm_musgrave.h"
#include "kernel/svm/svm_sky.h"
#include "kernel/svm/svm_tex_coord.h"
#include "kernel/svm/svm_value.h"
#include "kernel/svm/svm_voronoi.h"
#include "kernel/svm/svm_checker.h"
#include "kernel/svm/svm_brick.h"
#include "kernel/svm/svm_vector_rotate.h"
#include "kernel/svm/svm_vector_transform.h"
#include "kernel/svm/svm_vertex_color.h"
#include "kernel/svm/svm_voronoi.h"
#include "kernel/svm/svm_voxel.h"
#include "kernel/svm/svm_bump.h"
#include "kernel/svm/svm_map_range.h"
#include "kernel/svm/svm_clamp.h"
#include "kernel/svm/svm_wave.h"
#include "kernel/svm/svm_wavelength.h"
#include "kernel/svm/svm_white_noise.h"
#include "kernel/svm/svm_vertex_color.h"
#include "kernel/svm/svm_wireframe.h"
#ifdef __SHADER_RAYTRACE__
# include "kernel/svm/svm_ao.h"

4
intern/cycles/render/attribute.cpp

@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "render/image.h"
#include "render/attribute.h"
#include "render/hair.h"
#include "render/image.h"
#include "render/mesh.h"
#include "render/attribute.h"
#include "util/util_foreach.h"
#include "util/util_transform.h"

2
intern/cycles/render/background.cpp

@ -16,8 +16,8 @@
#include "render/background.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "render/shader.h"

2
intern/cycles/render/bake.cpp

@ -15,10 +15,10 @@
*/
#include "render/bake.h"
#include "render/integrator.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/shader.h"
#include "render/integrator.h"
#include "util/util_foreach.h"

2
intern/cycles/render/buffers.cpp

@ -16,8 +16,8 @@
#include <stdlib.h>
#include "render/buffers.h"
#include "device/device.h"
#include "render/buffers.h"
#include "util/util_foreach.h"
#include "util/util_hash.h"

2
intern/cycles/render/colorspace.cpp

@ -17,8 +17,8 @@
#include "render/colorspace.h"
#include "util/util_color.h"
#include "util/util_image.h"
#include "util/util_half.h"
#include "util/util_image.h"
#include "util/util_logging.h"
#include "util/util_math.h"
#include "util/util_thread.h"

2
intern/cycles/render/constant_fold.h

@ -17,8 +17,8 @@
#ifndef __CONSTANT_FOLD_H__
#define __CONSTANT_FOLD_H__
#include "util/util_types.h"
#include "kernel/svm/svm_types.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/render/curves.cpp

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "device/device.h"
#include "render/curves.h"
#include "device/device.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"

2
intern/cycles/render/denoising.h

@ -23,8 +23,8 @@
#include "render/buffers.h"
#include "util/util_string.h"
#include "util/util_vector.h"
#include "util/util_unique_ptr.h"
#include "util/util_vector.h"
#include <OpenImageIO/imageio.h>

4
intern/cycles/render/film.cpp

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "render/camera.h"
#include "device/device.h"
#include "render/film.h"
#include "device/device.h"
#include "render/camera.h"
#include "render/integrator.h"
#include "render/mesh.h"
#include "render/scene.h"

2
intern/cycles/render/geometry.cpp

@ -33,8 +33,8 @@
#include "render/shader.h"
#include "render/stats.h"
#include "subd/subd_split.h"
#include "subd/subd_patch_table.h"
#include "subd/subd_split.h"
#include "kernel/osl/osl_globals.h"

2
intern/cycles/render/geometry.h

@ -24,8 +24,8 @@
#include "render/attribute.h"
#include "util/util_boundbox.h"
#include "util/util_transform.h"
#include "util/util_set.h"
#include "util/util_transform.h"
#include "util/util_types.h"
#include "util/util_vector.h"

4
intern/cycles/render/graph.cpp

@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "render/attribute.h"
#include "render/graph.h"
#include "render/attribute.h"
#include "render/constant_fold.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/constant_fold.h"
#include "util/util_algorithm.h"
#include "util/util_foreach.h"

2
intern/cycles/render/hair.cpp

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "render/curves.h"
#include "render/hair.h"
#include "render/curves.h"
#include "render/scene.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/render/image.cpp

@ -15,9 +15,9 @@
*/
#include "render/image.h"
#include "render/image_oiio.h"
#include "device/device.h"
#include "render/colorspace.h"
#include "render/image_oiio.h"
#include "render/scene.h"
#include "render/stats.h"

4
intern/cycles/render/integrator.cpp

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "render/integrator.h"
#include "device/device.h"
#include "render/background.h"
#include "render/integrator.h"
#include "render/film.h"
#include "render/jitter.h"
#include "render/light.h"
@ -27,8 +27,8 @@
#include "kernel/kernel_types.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_hash.h"
#include "util/util_logging.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/render/light.cpp

@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "render/background.h"
#include "render/light.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/background.h"
#include "render/film.h"
#include "render/graph.h"
#include "render/light.h"
#include "render/integrator.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/object.h"
@ -28,9 +28,9 @@
#include "util/util_foreach.h"
#include "util/util_hash.h"
#include "util/util_logging.h"
#include "util/util_path.h"
#include "util/util_progress.h"
#include "util/util_logging.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/render/merge.cpp

@ -22,8 +22,8 @@
#include "util/util_time.h"
#include "util/util_unique_ptr.h"
#include <OpenImageIO/imageio.h>
#include <OpenImageIO/filesystem.h>
#include <OpenImageIO/imageio.h>
OIIO_NAMESPACE_USING

2
intern/cycles/render/mesh.cpp

@ -25,8 +25,8 @@
#include "render/object.h"
#include "render/scene.h"
#include "subd/subd_split.h"
#include "subd/subd_patch_table.h"
#include "subd/subd_split.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"

12
intern/cycles/render/mesh_subdivision.cpp

@ -14,16 +14,16 @@
* limitations under the License.
*/
#include "render/mesh.h"
#include "render/attribute.h"
#include "render/camera.h"
#include "render/mesh.h"
#include "subd/subd_split.h"
#include "subd/subd_patch.h"
#include "subd/subd_patch_table.h"
#include "subd/subd_split.h"
#include "util/util_foreach.h"
#include "util/util_algorithm.h"
#include "util/util_foreach.h"
#include "util/util_hash.h"
CCL_NAMESPACE_BEGIN