Cleanup: `make format` after SortedIncludes change

master
Dalai Felinto 4 years ago
parent 008aaaa378
commit 2d1cce8331

@ -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

@ -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>

@ -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);

@ -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)

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

@ -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;

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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

@ -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

@ -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

@ -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

@ -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"

@ -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

@ -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"

@ -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

@ -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"

@ -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"

@ -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"

@ -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

@ -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"

@ -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"

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

@ -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"

@ -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"

@ -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"

@ -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"

@ -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

@ -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"

@ -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;

@ -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

@ -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

@ -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__

@ -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

@ -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;

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

@ -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)
{

@ -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)
{

@ -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",

@ -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",

@ -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,

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

@ -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,

@ -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",

@ -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)
{

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

@ -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

@ -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",

@ -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,

@ -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},

@ -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,

@ -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)
{

@ -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,

@ -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),

@ -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",

@ -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,

@ -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

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

@ -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

@ -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,

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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

@ -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"

@ -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>

@ -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"

@ -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"

@ -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"

@ -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"

@ -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

@ -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"

@ -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

@ -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

@ -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

@ -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"

@ -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
@ -32,10 +32,10 @@ CCL_NAMESPACE_BEGIN
CCL_NAMESPACE_END
# include <opensubdiv/far/topologyRefinerFactory.h>
# include <opensubdiv/far/primvarRefiner.h>
# include <opensubdiv/far/patchTableFactory.h>
# include <opensubdiv/far/patchMap.h>
# include <opensubdiv/far/patchTableFactory.h>
# include <opensubdiv/far/primvarRefiner.h>
# include <opensubdiv/far/topologyRefinerFactory.h>
/* specializations of TopologyRefinerFactory for ccl::Mesh */

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "render/mesh.h"
#include "render/attribute.h"
#include "render/mesh.h"
#include "render/scene.h"
#include "util/util_foreach.h"

@ -14,17 +14,17 @@
* limitations under the License.
*/
#include "render/nodes.h"
#include "render/colorspace.h"
#include "render/constant_fold.h"
#include "render/film.h"
#include "render/image.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/osl.h"
#include "render/scene.h"
#include "render/svm.h"
#include "render/osl.h"
#include "render/constant_fold.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"

@ -17,9 +17,9 @@
#ifndef __NODES_H__
#define __NODES_H__
#include "graph/node.h"
#include "render/graph.h"
#include "render/image.h"
#include "graph/node.h"
#include "util/util_array.h"
#include "util/util_string.h"

@ -14,24 +14,24 @@
* limitations under the License.
*/
#include "render/camera.h"
#include "render/object.h"
#include "device/device.h"
#include "render/camera.h"
#include "render/curves.h"
#include "render/hair.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/curves.h"
#include "render/object.h"
#include "render/particles.h"
#include "render/scene.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_map.h"
#include "util/util_murmurhash.h"
#include "util/util_progress.h"
#include "util/util_set.h"
#include "util/util_vector.h"
#include "util/util_murmurhash.h"
#include "subd/subd_patch_table.h"

@ -23,8 +23,8 @@
#include "util/util_array.h"
#include "util/util_boundbox.h"
#include "util/util_param.h"
#include "util/util_transform.h"
#include "util/util_thread.h"
#include "util/util_transform.h"
#include "util/util_types.h"
#include "util/util_vector.h"

@ -20,10 +20,10 @@
#include "render/colorspace.h"
#include "render/graph.h"
#include "render/light.h"
#include "render/nodes.h"
#include "render/osl.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/nodes.h"
#ifdef WITH_OSL

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "device/device.h"
#include "render/particles.h"
#include "device/device.h"
#include "render/scene.h"
#include "util/util_foreach.h"

@ -16,11 +16,11 @@
#include <stdlib.h>
#include "device/device.h"
#include "render/background.h"
#include "render/bake.h"
#include "render/camera.h"
#include "render/curves.h"
#include "device/device.h"
#include "render/film.h"
#include "render/integrator.h"
#include "render/light.h"

@ -14,12 +14,13 @@
* limitations under the License.
*/
#include <string.h>
#include <limits.h>
#include <string.h>
#include "device/device.h"
#include "render/bake.h"
#include "render/buffers.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/light.h"
@ -27,7 +28,6 @@
#include "render/object.h"
#include "render/scene.h"
#include "render/session.h"
#include "render/bake.h"
#include "util/util_foreach.h"
#include "util/util_function.h"

@ -17,8 +17,8 @@
#ifndef __SESSION_H__
#define __SESSION_H__
#include "render/buffers.h"
#include "device/device.h"
#include "render/buffers.h"
#include "render/shader.h"
#include "render/stats.h"
#include "render/tile.h"

@ -23,8 +23,8 @@
# include <OSL/oslexec.h>
#endif
#include "render/attribute.h"
#include "kernel/kernel_types.h"
#include "render/attribute.h"
#include "graph/node.h"

@ -25,8 +25,8 @@
#include "render/shader.h"
#include "render/svm.h"
#include "util/util_logging.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_progress.h"
#include "util/util_task.h"

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "render/tables.h"
#include "device/device.h"
#include "render/scene.h"
#include "render/tables.h"
#include "util/util_logging.h"

@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "testing/testing.h"
#include "testing/mock_log.h"
#include "testing/testing.h"
#include "render/graph.h"
#include "render/scene.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "util/util_array.h"
#include "util/util_logging.h"
#include "util/util_string.h"

@ -15,8 +15,8 @@
*/
#include "testing/testing.h"
#include "util/util_types.h"
#include "util/util_system.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

@ -17,8 +17,8 @@
#ifndef __UTIL_BOUNDBOX_H__
#define __UTIL_BOUNDBOX_H__
#include <math.h>
#include <float.h>
#include <math.h>
#include "util/util_math.h"
#include "util/util_string.h"

@ -17,8 +17,8 @@
#ifndef __UTIL_DISJOINT_SET_H__
#define __UTIL_DISJOINT_SET_H__
#include <utility>
#include "util_array.h"
#include <utility>
CCL_NAMESPACE_BEGIN

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save