diff options
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 344 | ||||
-rw-r--r-- | intern/cycles/kernel/bake/bake.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 38 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/embree.h (renamed from intern/cycles/kernel/bvh/bvh_embree.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/local.h (renamed from intern/cycles/kernel/bvh/bvh_local.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/nodes.h (renamed from intern/cycles/kernel/bvh/bvh_nodes.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/shadow_all.h (renamed from intern/cycles/kernel/bvh/bvh_shadow_all.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/traversal.h (renamed from intern/cycles/kernel/bvh/bvh_traversal.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/types.h (renamed from intern/cycles/kernel/bvh/bvh_types.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/util.h (renamed from intern/cycles/kernel/bvh/bvh_util.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/volume.h (renamed from intern/cycles/kernel/bvh/bvh_volume.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/bvh/volume_all.h (renamed from intern/cycles/kernel/bvh/bvh_volume_all.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/camera/camera.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/camera/projection.h (renamed from intern/cycles/kernel/camera/camera_projection.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_diffuse.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_diffuse_ramp.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_hair_principled.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet.h | 7 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet_multi.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_principled_diffuse.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/compat.h | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/globals.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch_impl.h | 40 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_avx.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_avx2.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_sse2.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_sse3.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_sse41.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cuda/compat.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/device/cuda/globals.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 34 | ||||
-rw-r--r-- | intern/cycles/kernel/device/gpu/parallel_active_index.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/gpu/parallel_prefix_sum.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/gpu/parallel_sorted_index.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/device/hip/compat.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/device/hip/globals.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/device/optix/compat.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/device/optix/globals.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/device/optix/kernel.cu | 16 | ||||
-rw-r--r-- | intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu | 3 | ||||
-rw-r--r-- | intern/cycles/kernel/film/accumulate.h (renamed from intern/cycles/kernel/film/film_accumulate.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/film/adaptive_sampling.h (renamed from intern/cycles/kernel/film/film_adaptive_sampling.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/film/id_passes.h (renamed from intern/cycles/kernel/film/film_id_passes.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/film/passes.h (renamed from intern/cycles/kernel/film/film_passes.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/film/read.h (renamed from intern/cycles/kernel/film/film_read.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/film/write_passes.h (renamed from intern/cycles/kernel/film/film_write_passes.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/attribute.h (renamed from intern/cycles/kernel/geom/geom_attribute.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/curve.h (renamed from intern/cycles/kernel/geom/geom_curve.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/curve_intersect.h (renamed from intern/cycles/kernel/geom/geom_curve_intersect.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/geom.h | 30 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/motion_curve.h (renamed from intern/cycles/kernel/geom/geom_motion_curve.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/motion_triangle.h (renamed from intern/cycles/kernel/geom/geom_motion_triangle.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/motion_triangle_intersect.h (renamed from intern/cycles/kernel/geom/geom_motion_triangle_intersect.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/motion_triangle_shader.h (renamed from intern/cycles/kernel/geom/geom_motion_triangle_shader.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/object.h (renamed from intern/cycles/kernel/geom/geom_object.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/patch.h (renamed from intern/cycles/kernel/geom/geom_patch.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/primitive.h (renamed from intern/cycles/kernel/geom/geom_primitive.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/shader_data.h (renamed from intern/cycles/kernel/geom/geom_shader_data.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/subd_triangle.h (renamed from intern/cycles/kernel/geom/geom_subd_triangle.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/triangle.h (renamed from intern/cycles/kernel/geom/geom_triangle.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/triangle_intersect.h (renamed from intern/cycles/kernel/geom/geom_triangle_intersect.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/volume.h (renamed from intern/cycles/kernel/geom/geom_volume.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/init_from_bake.h (renamed from intern/cycles/kernel/integrator/integrator_init_from_bake.h) | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/init_from_camera.h (renamed from intern/cycles/kernel/integrator/integrator_init_from_camera.h) | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/intersect_closest.h (renamed from intern/cycles/kernel/integrator/integrator_intersect_closest.h) | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/intersect_shadow.h (renamed from intern/cycles/kernel/integrator/integrator_intersect_shadow.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/intersect_subsurface.h (renamed from intern/cycles/kernel/integrator/integrator_intersect_subsurface.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/intersect_volume_stack.h (renamed from intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/megakernel.h (renamed from intern/cycles/kernel/integrator/integrator_megakernel.h) | 20 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/path_state.h (renamed from intern/cycles/kernel/integrator/integrator_path_state.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shade_background.h (renamed from intern/cycles/kernel/integrator/integrator_shade_background.h) | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shade_light.h (renamed from intern/cycles/kernel/integrator/integrator_shade_light.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shade_shadow.h (renamed from intern/cycles/kernel/integrator/integrator_shade_shadow.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shade_surface.h (renamed from intern/cycles/kernel/integrator/integrator_shade_surface.h) | 16 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shade_volume.h (renamed from intern/cycles/kernel/integrator/integrator_shade_volume.h) | 16 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shader_eval.h (renamed from intern/cycles/kernel/integrator/integrator_shader_eval.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shadow_catcher.h (renamed from intern/cycles/kernel/integrator/integrator_shadow_catcher.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/shadow_state_template.h (renamed from intern/cycles/kernel/integrator/integrator_shadow_state_template.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/state.h (renamed from intern/cycles/kernel/integrator/integrator_state.h) | 12 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/state_flow.h (renamed from intern/cycles/kernel/integrator/integrator_state_flow.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/state_template.h (renamed from intern/cycles/kernel/integrator/integrator_state_template.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/state_util.h (renamed from intern/cycles/kernel/integrator/integrator_state_util.h) | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/subsurface.h (renamed from intern/cycles/kernel/integrator/integrator_subsurface.h) | 12 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/subsurface_disk.h (renamed from intern/cycles/kernel/integrator/integrator_subsurface_disk.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/subsurface_random_walk.h (renamed from intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/volume_stack.h (renamed from intern/cycles/kernel/integrator/integrator_volume_stack.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/light/background.h (renamed from intern/cycles/kernel/light/light_background.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/light/common.h (renamed from intern/cycles/kernel/light/light_common.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/light/light.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/light/sample.h (renamed from intern/cycles/kernel/light/light_sample.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 16 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/background.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/bsdf_phong_ramp.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/bssrdf.cpp (renamed from intern/cycles/kernel/osl/osl_bssrdf.cpp) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/closures.cpp (renamed from intern/cycles/kernel/osl/osl_closures.cpp) | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/closures.h (renamed from intern/cycles/kernel/osl/osl_closures.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/emissive.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/globals.h (renamed from intern/cycles/kernel/osl/osl_globals.h) | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/services.cpp (renamed from intern/cycles/kernel/osl/osl_services.cpp) | 28 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/services.h (renamed from intern/cycles/kernel/osl/osl_services.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/shader.cpp (renamed from intern/cycles/kernel/osl/osl_shader.cpp) | 14 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/shader.h (renamed from intern/cycles/kernel/osl/osl_shader.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/sample/jitter.h (renamed from intern/cycles/kernel/sample/sample_jitter.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/sample/lcg.h | 51 | ||||
-rw-r--r-- | intern/cycles/kernel/sample/mapping.h (renamed from intern/cycles/kernel/sample/sample_mapping.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/sample/mis.h | 64 | ||||
-rw-r--r-- | intern/cycles/kernel/sample/pattern.h (renamed from intern/cycles/kernel/sample/sample_pattern.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/ao.h (renamed from intern/cycles/kernel/svm/svm_ao.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/aov.h (renamed from intern/cycles/kernel/svm/svm_aov.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/attribute.h (renamed from intern/cycles/kernel/svm/svm_attribute.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/bevel.h (renamed from intern/cycles/kernel/svm/svm_bevel.h) | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/blackbody.h (renamed from intern/cycles/kernel/svm/svm_blackbody.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/brick.h (renamed from intern/cycles/kernel/svm/svm_brick.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/brightness.h (renamed from intern/cycles/kernel/svm/svm_brightness.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/bump.h (renamed from intern/cycles/kernel/svm/svm_bump.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/camera.h (renamed from intern/cycles/kernel/svm/svm_camera.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/checker.h (renamed from intern/cycles/kernel/svm/svm_checker.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/clamp.h (renamed from intern/cycles/kernel/svm/svm_clamp.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/closure.h (renamed from intern/cycles/kernel/svm/svm_closure.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/color_util.h (renamed from intern/cycles/kernel/svm/svm_color_util.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/convert.h (renamed from intern/cycles/kernel/svm/svm_convert.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/displace.h (renamed from intern/cycles/kernel/svm/svm_displace.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/fractal_noise.h (renamed from intern/cycles/kernel/svm/svm_fractal_noise.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/fresnel.h (renamed from intern/cycles/kernel/svm/svm_fresnel.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/gamma.h (renamed from intern/cycles/kernel/svm/svm_gamma.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/geometry.h (renamed from intern/cycles/kernel/svm/svm_geometry.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/gradient.h (renamed from intern/cycles/kernel/svm/svm_gradient.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/hsv.h (renamed from intern/cycles/kernel/svm/svm_hsv.h) | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/ies.h (renamed from intern/cycles/kernel/svm/svm_ies.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/image.h (renamed from intern/cycles/kernel/svm/svm_image.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/invert.h (renamed from intern/cycles/kernel/svm/svm_invert.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/light_path.h (renamed from intern/cycles/kernel/svm/svm_light_path.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/magic.h (renamed from intern/cycles/kernel/svm/svm_magic.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/map_range.h (renamed from intern/cycles/kernel/svm/svm_map_range.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/mapping.h (renamed from intern/cycles/kernel/svm/svm_mapping.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/mapping_util.h (renamed from intern/cycles/kernel/svm/svm_mapping_util.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/math.h (renamed from intern/cycles/kernel/svm/svm_math.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/math_util.h (renamed from intern/cycles/kernel/svm/svm_math_util.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/mix.h (renamed from intern/cycles/kernel/svm/svm_mix.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/musgrave.h (renamed from intern/cycles/kernel/svm/svm_musgrave.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/noise.h (renamed from intern/cycles/kernel/svm/svm_noise.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/noisetex.h (renamed from intern/cycles/kernel/svm/svm_noisetex.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/normal.h (renamed from intern/cycles/kernel/svm/svm_normal.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/ramp.h (renamed from intern/cycles/kernel/svm/svm_ramp.h) | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/ramp_util.h (renamed from intern/cycles/kernel/svm/svm_ramp_util.h) | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/sepcomb_hsv.h (renamed from intern/cycles/kernel/svm/svm_sepcomb_hsv.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/sepcomb_vector.h (renamed from intern/cycles/kernel/svm/svm_sepcomb_vector.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/sky.h (renamed from intern/cycles/kernel/svm/svm_sky.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm.h | 106 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/tex_coord.h (renamed from intern/cycles/kernel/svm/svm_tex_coord.h) | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/types.h (renamed from intern/cycles/kernel/svm/svm_types.h) | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/value.h (renamed from intern/cycles/kernel/svm/svm_value.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/vector_rotate.h (renamed from intern/cycles/kernel/svm/svm_vector_rotate.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/vector_transform.h (renamed from intern/cycles/kernel/svm/svm_vector_transform.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/vertex_color.h (renamed from intern/cycles/kernel/svm/svm_vertex_color.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/voronoi.h (renamed from intern/cycles/kernel/svm/svm_voronoi.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/voxel.h (renamed from intern/cycles/kernel/svm/svm_voxel.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/wave.h (renamed from intern/cycles/kernel/svm/svm_wave.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/wavelength.h (renamed from intern/cycles/kernel/svm/svm_wavelength.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/white_noise.h (renamed from intern/cycles/kernel/svm/svm_white_noise.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/wireframe.h (renamed from intern/cycles/kernel/svm/svm_wireframe.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/textures.h (renamed from intern/cycles/kernel/kernel_textures.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/types.h (renamed from intern/cycles/kernel/kernel_types.h) | 18 | ||||
-rw-r--r-- | intern/cycles/kernel/util/color.h (renamed from intern/cycles/kernel/util/util_color.h) | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/util/differential.h (renamed from intern/cycles/kernel/util/util_differential.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/util/lookup_table.h (renamed from intern/cycles/kernel/util/util_lookup_table.h) | 0 | ||||
-rw-r--r-- | intern/cycles/kernel/util/profiling.h (renamed from intern/cycles/kernel/util/util_profiling.h) | 2 |
171 files changed, 749 insertions, 542 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index f27bcb41d3d..6d57eff3d22 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -47,41 +47,41 @@ set(SRC_DEVICE_OPTIX set(SRC_HEADERS bake/bake.h bvh/bvh.h - bvh/bvh_nodes.h - bvh/bvh_shadow_all.h - bvh/bvh_local.h - bvh/bvh_traversal.h - bvh/bvh_types.h - bvh/bvh_util.h - bvh/bvh_volume.h - bvh/bvh_volume_all.h - bvh/bvh_embree.h + bvh/nodes.h + bvh/shadow_all.h + bvh/local.h + bvh/traversal.h + bvh/types.h + bvh/util.h + bvh/volume.h + bvh/volume_all.h + bvh/embree.h camera/camera.h - camera/camera_projection.h - film/film_accumulate.h - film/film_adaptive_sampling.h - film/film_id_passes.h - film/film_passes.h - film/film_read.h - film/film_write_passes.h - integrator/integrator_path_state.h - integrator/integrator_shader_eval.h - integrator/integrator_shadow_catcher.h - kernel_textures.h - kernel_types.h + camera/projection.h + film/accumulate.h + film/adaptive_sampling.h + film/id_passes.h + film/passes.h + film/read.h + film/write_passes.h + integrator/path_state.h + integrator/shader_eval.h + integrator/shadow_catcher.h + textures.h + types.h light/light.h - light/light_background.h - light/light_common.h - light/light_sample.h - sample/sample_jitter.h - sample/sample_lcg.h - sample/sample_mapping.h - sample/sample_mis.h - sample/sample_pattern.h - util/util_color.h - util/util_differential.h - util/util_lookup_table.h - util/util_profiling.h + light/background.h + light/common.h + light/sample.h + sample/jitter.h + sample/lcg.h + sample/mapping.h + sample/mis.h + sample/pattern.h + util/color.h + util/differential.h + util/lookup_table.h + util/profiling.h ) set(SRC_DEVICE_CPU_HEADERS @@ -147,155 +147,155 @@ set(SRC_CLOSURE_HEADERS set(SRC_SVM_HEADERS svm/svm.h - svm/svm_ao.h - svm/svm_aov.h - svm/svm_attribute.h - svm/svm_bevel.h - svm/svm_blackbody.h - svm/svm_bump.h - svm/svm_camera.h - svm/svm_clamp.h - svm/svm_closure.h - svm/svm_convert.h - svm/svm_checker.h - svm/svm_color_util.h - svm/svm_brick.h - svm/svm_displace.h - svm/svm_fresnel.h - svm/svm_wireframe.h - svm/svm_wavelength.h - svm/svm_gamma.h - svm/svm_brightness.h - svm/svm_geometry.h - svm/svm_gradient.h - svm/svm_hsv.h - svm/svm_ies.h - svm/svm_image.h - svm/svm_invert.h - svm/svm_light_path.h - svm/svm_magic.h - svm/svm_map_range.h - svm/svm_mapping.h - svm/svm_mapping_util.h - svm/svm_math.h - svm/svm_math_util.h - svm/svm_mix.h - svm/svm_musgrave.h - svm/svm_noise.h - svm/svm_noisetex.h - svm/svm_normal.h - svm/svm_ramp.h - svm/svm_ramp_util.h - svm/svm_sepcomb_hsv.h - svm/svm_sepcomb_vector.h - svm/svm_sky.h - svm/svm_tex_coord.h - svm/svm_fractal_noise.h - svm/svm_types.h - svm/svm_value.h - svm/svm_vector_rotate.h - svm/svm_vector_transform.h - svm/svm_voronoi.h - svm/svm_voxel.h - svm/svm_wave.h - svm/svm_white_noise.h - svm/svm_vertex_color.h + svm/ao.h + svm/aov.h + svm/attribute.h + svm/bevel.h + svm/blackbody.h + svm/bump.h + svm/camera.h + svm/clamp.h + svm/closure.h + svm/convert.h + svm/checker.h + svm/color_util.h + svm/brick.h + svm/displace.h + svm/fresnel.h + svm/wireframe.h + svm/wavelength.h + svm/gamma.h + svm/brightness.h + svm/geometry.h + svm/gradient.h + svm/hsv.h + svm/ies.h + svm/image.h + svm/invert.h + svm/light_path.h + svm/magic.h + svm/map_range.h + svm/mapping.h + svm/mapping_util.h + svm/math.h + svm/math_util.h + svm/mix.h + svm/musgrave.h + svm/noise.h + svm/noisetex.h + svm/normal.h + svm/ramp.h + svm/ramp_util.h + svm/sepcomb_hsv.h + svm/sepcomb_vector.h + svm/sky.h + svm/tex_coord.h + svm/fractal_noise.h + svm/types.h + svm/value.h + svm/vector_rotate.h + svm/vector_transform.h + svm/voronoi.h + svm/voxel.h + svm/wave.h + svm/white_noise.h + svm/vertex_color.h ) set(SRC_GEOM_HEADERS geom/geom.h - geom/geom_attribute.h - geom/geom_curve.h - geom/geom_curve_intersect.h - geom/geom_motion_curve.h - geom/geom_motion_triangle.h - geom/geom_motion_triangle_intersect.h - geom/geom_motion_triangle_shader.h - geom/geom_object.h - geom/geom_patch.h - geom/geom_primitive.h - geom/geom_shader_data.h - geom/geom_subd_triangle.h - geom/geom_triangle.h - geom/geom_triangle_intersect.h - geom/geom_volume.h + geom/attribute.h + geom/curve.h + geom/curve_intersect.h + geom/motion_curve.h + geom/motion_triangle.h + geom/motion_triangle_intersect.h + geom/motion_triangle_shader.h + geom/object.h + geom/patch.h + geom/primitive.h + geom/shader_data.h + geom/subd_triangle.h + geom/triangle.h + geom/triangle_intersect.h + geom/volume.h ) set(SRC_INTEGRATOR_HEADERS - integrator/integrator_init_from_bake.h - integrator/integrator_init_from_camera.h - integrator/integrator_intersect_closest.h - integrator/integrator_intersect_shadow.h - integrator/integrator_intersect_subsurface.h - integrator/integrator_intersect_volume_stack.h - integrator/integrator_megakernel.h - integrator/integrator_shade_background.h - integrator/integrator_shade_light.h - integrator/integrator_shade_shadow.h - integrator/integrator_shade_surface.h - integrator/integrator_shade_volume.h - integrator/integrator_shadow_state_template.h - integrator/integrator_state.h - integrator/integrator_state_flow.h - integrator/integrator_state_template.h - integrator/integrator_state_util.h - integrator/integrator_subsurface.h - integrator/integrator_subsurface_disk.h - integrator/integrator_subsurface_random_walk.h - integrator/integrator_volume_stack.h + integrator/init_from_bake.h + integrator/init_from_camera.h + integrator/intersect_closest.h + integrator/intersect_shadow.h + integrator/intersect_subsurface.h + integrator/intersect_volume_stack.h + integrator/megakernel.h + integrator/shade_background.h + integrator/shade_light.h + integrator/shade_shadow.h + integrator/shade_surface.h + integrator/shade_volume.h + integrator/shadow_state_template.h + integrator/state.h + integrator/state_flow.h + integrator/state_template.h + integrator/state_util.h + integrator/subsurface.h + integrator/subsurface_disk.h + integrator/subsurface_random_walk.h + integrator/volume_stack.h ) set(SRC_UTIL_HEADERS - ../util/util_atomic.h - ../util/util_color.h - ../util/util_defines.h - ../util/util_half.h - ../util/util_hash.h - ../util/util_math.h - ../util/util_math_fast.h - ../util/util_math_intersect.h - ../util/util_math_float2.h - ../util/util_math_float3.h - ../util/util_math_float4.h - ../util/util_math_int2.h - ../util/util_math_int3.h - ../util/util_math_int4.h - ../util/util_math_matrix.h - ../util/util_projection.h - ../util/util_rect.h - ../util/util_static_assert.h - ../util/util_transform.h - ../util/util_texture.h - ../util/util_types.h - ../util/util_types_float2.h - ../util/util_types_float2_impl.h - ../util/util_types_float3.h - ../util/util_types_float3_impl.h - ../util/util_types_float4.h - ../util/util_types_float4_impl.h - ../util/util_types_float8.h - ../util/util_types_float8_impl.h - ../util/util_types_int2.h - ../util/util_types_int2_impl.h - ../util/util_types_int3.h - ../util/util_types_int3_impl.h - ../util/util_types_int4.h - ../util/util_types_int4_impl.h - ../util/util_types_uchar2.h - ../util/util_types_uchar2_impl.h - ../util/util_types_uchar3.h - ../util/util_types_uchar3_impl.h - ../util/util_types_uchar4.h - ../util/util_types_uchar4_impl.h - ../util/util_types_uint2.h - ../util/util_types_uint2_impl.h - ../util/util_types_uint3.h - ../util/util_types_uint3_impl.h - ../util/util_types_uint4.h - ../util/util_types_uint4_impl.h - ../util/util_types_ushort4.h - ../util/util_types_vector3.h - ../util/util_types_vector3_impl.h + ../util/atomic.h + ../util/color.h + ../util/defines.h + ../util/half.h + ../util/hash.h + ../util/math.h + ../util/math_fast.h + ../util/math_intersect.h + ../util/math_float2.h + ../util/math_float3.h + ../util/math_float4.h + ../util/math_int2.h + ../util/math_int3.h + ../util/math_int4.h + ../util/math_matrix.h + ../util/projection.h + ../util/rect.h + ../util/static_assert.h + ../util/transform.h + ../util/texture.h + ../util/types.h + ../util/types_float2.h + ../util/types_float2_impl.h + ../util/types_float3.h + ../util/types_float3_impl.h + ../util/types_float4.h + ../util/types_float4_impl.h + ../util/types_float8.h + ../util/types_float8_impl.h + ../util/types_int2.h + ../util/types_int2_impl.h + ../util/types_int3.h + ../util/types_int3_impl.h + ../util/types_int4.h + ../util/types_int4_impl.h + ../util/types_uchar2.h + ../util/types_uchar2_impl.h + ../util/types_uchar3.h + ../util/types_uchar3_impl.h + ../util/types_uchar4.h + ../util/types_uchar4_impl.h + ../util/types_uint2.h + ../util/types_uint2_impl.h + ../util/types_uint3.h + ../util/types_uint3_impl.h + ../util/types_uint4.h + ../util/types_uint4_impl.h + ../util/types_ushort4.h + ../util/types_vector3.h + ../util/types_vector3_impl.h ) set(LIB diff --git a/intern/cycles/kernel/bake/bake.h b/intern/cycles/kernel/bake/bake.h index e234d56bd3c..0a78a635d75 100644 --- a/intern/cycles/kernel/bake/bake.h +++ b/intern/cycles/kernel/bake/bake.h @@ -16,8 +16,8 @@ #pragma once -#include "kernel/camera/camera_projection.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/camera/projection.h" +#include "kernel/integrator/shader_eval.h" #include "kernel/geom/geom.h" diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index 813ac15711e..0e083812355 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -28,13 +28,13 @@ #pragma once #ifdef __EMBREE__ -# include "kernel/bvh/bvh_embree.h" +# include "kernel/bvh/embree.h" #endif -#include "kernel/bvh/bvh_types.h" -#include "kernel/bvh/bvh_util.h" +#include "kernel/bvh/types.h" +#include "kernel/bvh/util.h" -#include "kernel/integrator/integrator_state_util.h" +#include "kernel/integrator/state_util.h" CCL_NAMESPACE_BEGIN @@ -42,28 +42,28 @@ CCL_NAMESPACE_BEGIN /* Regular BVH traversal */ -# include "kernel/bvh/bvh_nodes.h" +# include "kernel/bvh/nodes.h" # define BVH_FUNCTION_NAME bvh_intersect # define BVH_FUNCTION_FEATURES 0 -# include "kernel/bvh/bvh_traversal.h" +# include "kernel/bvh/traversal.h" # if defined(__HAIR__) # define BVH_FUNCTION_NAME bvh_intersect_hair # define BVH_FUNCTION_FEATURES BVH_HAIR -# include "kernel/bvh/bvh_traversal.h" +# include "kernel/bvh/traversal.h" # endif # if defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_motion # define BVH_FUNCTION_FEATURES BVH_MOTION -# include "kernel/bvh/bvh_traversal.h" +# include "kernel/bvh/traversal.h" # endif # if defined(__HAIR__) && defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_hair_motion # define BVH_FUNCTION_FEATURES BVH_HAIR | BVH_MOTION -# include "kernel/bvh/bvh_traversal.h" +# include "kernel/bvh/traversal.h" # endif /* Subsurface scattering BVH traversal */ @@ -71,12 +71,12 @@ CCL_NAMESPACE_BEGIN # if defined(__BVH_LOCAL__) # define BVH_FUNCTION_NAME bvh_intersect_local # define BVH_FUNCTION_FEATURES BVH_HAIR -# include "kernel/bvh/bvh_local.h" +# include "kernel/bvh/local.h" # if defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_local_motion # define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR -# include "kernel/bvh/bvh_local.h" +# include "kernel/bvh/local.h" # endif # endif /* __BVH_LOCAL__ */ @@ -85,12 +85,12 @@ CCL_NAMESPACE_BEGIN # if defined(__VOLUME__) # define BVH_FUNCTION_NAME bvh_intersect_volume # define BVH_FUNCTION_FEATURES BVH_HAIR -# include "kernel/bvh/bvh_volume.h" +# include "kernel/bvh/volume.h" # if defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_volume_motion # define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR -# include "kernel/bvh/bvh_volume.h" +# include "kernel/bvh/volume.h" # endif # endif /* __VOLUME__ */ @@ -99,24 +99,24 @@ CCL_NAMESPACE_BEGIN # if defined(__SHADOW_RECORD_ALL__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all # define BVH_FUNCTION_FEATURES 0 -# include "kernel/bvh/bvh_shadow_all.h" +# include "kernel/bvh/shadow_all.h" # if defined(__HAIR__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair # define BVH_FUNCTION_FEATURES BVH_HAIR -# include "kernel/bvh/bvh_shadow_all.h" +# include "kernel/bvh/shadow_all.h" # endif # if defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion # define BVH_FUNCTION_FEATURES BVH_MOTION -# include "kernel/bvh/bvh_shadow_all.h" +# include "kernel/bvh/shadow_all.h" # endif # if defined(__HAIR__) && defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair_motion # define BVH_FUNCTION_FEATURES BVH_HAIR | BVH_MOTION -# include "kernel/bvh/bvh_shadow_all.h" +# include "kernel/bvh/shadow_all.h" # endif # endif /* __SHADOW_RECORD_ALL__ */ @@ -125,12 +125,12 @@ CCL_NAMESPACE_BEGIN # if defined(__VOLUME_RECORD_ALL__) # define BVH_FUNCTION_NAME bvh_intersect_volume_all # define BVH_FUNCTION_FEATURES BVH_HAIR -# include "kernel/bvh/bvh_volume_all.h" +# include "kernel/bvh/volume_all.h" # if defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_volume_all_motion # define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR -# include "kernel/bvh/bvh_volume_all.h" +# include "kernel/bvh/volume_all.h" # endif # endif /* __VOLUME_RECORD_ALL__ */ diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/embree.h index 321e0f28dae..9edd4f90a7e 100644 --- a/intern/cycles/kernel/bvh/bvh_embree.h +++ b/intern/cycles/kernel/bvh/embree.h @@ -22,7 +22,7 @@ #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/globals.h" -#include "util/util_vector.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/bvh/bvh_local.h b/intern/cycles/kernel/bvh/local.h index 79cde69699e..79cde69699e 100644 --- a/intern/cycles/kernel/bvh/bvh_local.h +++ b/intern/cycles/kernel/bvh/local.h diff --git a/intern/cycles/kernel/bvh/bvh_nodes.h b/intern/cycles/kernel/bvh/nodes.h index 71122085f69..71122085f69 100644 --- a/intern/cycles/kernel/bvh/bvh_nodes.h +++ b/intern/cycles/kernel/bvh/nodes.h diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/shadow_all.h index 049c6a03fe0..049c6a03fe0 100644 --- a/intern/cycles/kernel/bvh/bvh_shadow_all.h +++ b/intern/cycles/kernel/bvh/shadow_all.h diff --git a/intern/cycles/kernel/bvh/bvh_traversal.h b/intern/cycles/kernel/bvh/traversal.h index 1c17ebf767f..1c17ebf767f 100644 --- a/intern/cycles/kernel/bvh/bvh_traversal.h +++ b/intern/cycles/kernel/bvh/traversal.h diff --git a/intern/cycles/kernel/bvh/bvh_types.h b/intern/cycles/kernel/bvh/types.h index 6039e707fc3..6039e707fc3 100644 --- a/intern/cycles/kernel/bvh/bvh_types.h +++ b/intern/cycles/kernel/bvh/types.h diff --git a/intern/cycles/kernel/bvh/bvh_util.h b/intern/cycles/kernel/bvh/util.h index 8686f887021..8686f887021 100644 --- a/intern/cycles/kernel/bvh/bvh_util.h +++ b/intern/cycles/kernel/bvh/util.h diff --git a/intern/cycles/kernel/bvh/bvh_volume.h b/intern/cycles/kernel/bvh/volume.h index fa56bd02bef..fa56bd02bef 100644 --- a/intern/cycles/kernel/bvh/bvh_volume.h +++ b/intern/cycles/kernel/bvh/volume.h diff --git a/intern/cycles/kernel/bvh/bvh_volume_all.h b/intern/cycles/kernel/bvh/volume_all.h index 1d7d942e736..1d7d942e736 100644 --- a/intern/cycles/kernel/bvh/bvh_volume_all.h +++ b/intern/cycles/kernel/bvh/volume_all.h diff --git a/intern/cycles/kernel/camera/camera.h b/intern/cycles/kernel/camera/camera.h index 66bc25bb879..e966e9e1596 100644 --- a/intern/cycles/kernel/camera/camera.h +++ b/intern/cycles/kernel/camera/camera.h @@ -16,10 +16,10 @@ #pragma once -#include "kernel/camera/camera_projection.h" -#include "kernel/sample/sample_mapping.h" -#include "kernel/util/util_differential.h" -#include "kernel/util/util_lookup_table.h" +#include "kernel/camera/projection.h" +#include "kernel/sample/mapping.h" +#include "kernel/util/differential.h" +#include "kernel/util/lookup_table.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/camera/camera_projection.h b/intern/cycles/kernel/camera/projection.h index 0aea82fa812..0aea82fa812 100644 --- a/intern/cycles/kernel/camera/camera_projection.h +++ b/intern/cycles/kernel/camera/projection.h diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h index fa88c66f536..b2a9c9555c3 100644 --- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h +++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h @@ -32,7 +32,7 @@ #pragma once -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_diffuse.h b/intern/cycles/kernel/closure/bsdf_diffuse.h index dd3b4500b1f..3139cb612fa 100644 --- a/intern/cycles/kernel/closure/bsdf_diffuse.h +++ b/intern/cycles/kernel/closure/bsdf_diffuse.h @@ -32,7 +32,7 @@ #pragma once -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h index 1e70d3e534e..fbb82617dad 100644 --- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h +++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h @@ -32,7 +32,7 @@ #pragma once -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_hair_principled.h b/intern/cycles/kernel/closure/bsdf_hair_principled.h index ff554d4a60e..f55ea0f6a2e 100644 --- a/intern/cycles/kernel/closure/bsdf_hair_principled.h +++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h @@ -20,7 +20,7 @@ # include <fenv.h> #endif -#include "kernel/util/util_color.h" +#include "kernel/util/color.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h index 28aac368f2b..83242a73685 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet.h @@ -32,8 +32,11 @@ #pragma once -#include "kernel/sample/sample_pattern.h" -#include "kernel/util/util_lookup_table.h" +#include "kernel/closure/bsdf_util.h" + +#include "kernel/sample/pattern.h" + +#include "kernel/util/lookup_table.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h index b1ab8d7ffd0..77370fbec4e 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h @@ -16,8 +16,8 @@ #pragma once -#include "kernel/sample/sample_lcg.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/lcg.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h index 0e3b21117b5..69376c1294d 100644 --- a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h +++ b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h @@ -27,7 +27,7 @@ #include "kernel/closure/bsdf_util.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/device/cpu/compat.h b/intern/cycles/kernel/device/cpu/compat.h index 888c0d5d872..5ccca52255f 100644 --- a/intern/cycles/kernel/device/cpu/compat.h +++ b/intern/cycles/kernel/device/cpu/compat.h @@ -26,11 +26,11 @@ # pragma GCC diagnostic ignored "-Wuninitialized" #endif -#include "util/util_half.h" -#include "util/util_math.h" -#include "util/util_simd.h" -#include "util/util_texture.h" -#include "util/util_types.h" +#include "util/half.h" +#include "util/math.h" +#include "util/simd.h" +#include "util/texture.h" +#include "util/types.h" /* On x86_64, versions of glibc < 2.16 have an issue where expf is * much slower than the double version. This was fixed in glibc 2.16. diff --git a/intern/cycles/kernel/device/cpu/globals.h b/intern/cycles/kernel/device/cpu/globals.h index f3e530a9edc..dd0327b3f94 100644 --- a/intern/cycles/kernel/device/cpu/globals.h +++ b/intern/cycles/kernel/device/cpu/globals.h @@ -18,8 +18,8 @@ #pragma once -#include "kernel/kernel_types.h" -#include "kernel/util/util_profiling.h" +#include "kernel/types.h" +#include "kernel/util/profiling.h" CCL_NAMESPACE_BEGIN @@ -36,7 +36,7 @@ struct OSLShadingSystem; typedef struct KernelGlobalsCPU { #define KERNEL_TEX(type, name) texture<type> name; -#include "kernel/kernel_textures.h" +#include "kernel/textures.h" KernelData __data; diff --git a/intern/cycles/kernel/device/cpu/kernel.cpp b/intern/cycles/kernel/device/cpu/kernel.cpp index 8519b77aa08..a16c637d5ac 100644 --- a/intern/cycles/kernel/device/cpu/kernel.cpp +++ b/intern/cycles/kernel/device/cpu/kernel.cpp @@ -85,7 +85,7 @@ void kernel_global_memory_copy(KernelGlobalsCPU *kg, const char *name, void *mem kg->tname.data = (type *)mem; \ kg->tname.width = size; \ } -#include "kernel/kernel_textures.h" +#include "kernel/textures.h" else { assert(0); } diff --git a/intern/cycles/kernel/device/cpu/kernel.h b/intern/cycles/kernel/device/cpu/kernel.h index 28337a58898..c49d7ca445a 100644 --- a/intern/cycles/kernel/device/cpu/kernel.h +++ b/intern/cycles/kernel/device/cpu/kernel.h @@ -18,9 +18,9 @@ /* CPU Kernel Interface */ -#include "util/util_types.h" +#include "util/types.h" -#include "kernel/kernel_types.h" +#include "kernel/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h index 148b6a33cb5..6df5d7787fc 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h @@ -29,26 +29,26 @@ # include "kernel/device/cpu/globals.h" # include "kernel/device/cpu/image.h" -# include "kernel/integrator/integrator_state.h" -# include "kernel/integrator/integrator_state_flow.h" -# include "kernel/integrator/integrator_state_util.h" - -# include "kernel/integrator/integrator_init_from_camera.h" -# include "kernel/integrator/integrator_init_from_bake.h" -# include "kernel/integrator/integrator_intersect_closest.h" -# include "kernel/integrator/integrator_intersect_shadow.h" -# include "kernel/integrator/integrator_intersect_subsurface.h" -# include "kernel/integrator/integrator_intersect_volume_stack.h" -# include "kernel/integrator/integrator_shade_background.h" -# include "kernel/integrator/integrator_shade_light.h" -# include "kernel/integrator/integrator_shade_shadow.h" -# include "kernel/integrator/integrator_shade_surface.h" -# include "kernel/integrator/integrator_shade_volume.h" -# include "kernel/integrator/integrator_megakernel.h" - -# include "kernel/film/film_adaptive_sampling.h" -# include "kernel/film/film_read.h" -# include "kernel/film/film_id_passes.h" +# include "kernel/integrator/state.h" +# include "kernel/integrator/state_flow.h" +# include "kernel/integrator/state_util.h" + +# include "kernel/integrator/init_from_camera.h" +# include "kernel/integrator/init_from_bake.h" +# include "kernel/integrator/intersect_closest.h" +# include "kernel/integrator/intersect_shadow.h" +# include "kernel/integrator/intersect_subsurface.h" +# include "kernel/integrator/intersect_volume_stack.h" +# include "kernel/integrator/shade_background.h" +# include "kernel/integrator/shade_light.h" +# include "kernel/integrator/shade_shadow.h" +# include "kernel/integrator/shade_surface.h" +# include "kernel/integrator/shade_volume.h" +# include "kernel/integrator/megakernel.h" + +# include "kernel/film/adaptive_sampling.h" +# include "kernel/film/read.h" +# include "kernel/film/id_passes.h" # include "kernel/bake/bake.h" diff --git a/intern/cycles/kernel/device/cpu/kernel_avx.cpp b/intern/cycles/kernel/device/cpu/kernel_avx.cpp index 220768036ab..cece750a255 100644 --- a/intern/cycles/kernel/device/cpu/kernel_avx.cpp +++ b/intern/cycles/kernel/device/cpu/kernel_avx.cpp @@ -18,7 +18,7 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -#include "util/util_optimization.h" +#include "util/optimization.h" #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX # define KERNEL_STUB diff --git a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp index 90c05113cbe..fad4581236e 100644 --- a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp +++ b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp @@ -18,7 +18,7 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -#include "util/util_optimization.h" +#include "util/optimization.h" #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 # define KERNEL_STUB diff --git a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp index fb85ef5b0d0..5fb4849ac08 100644 --- a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp +++ b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp @@ -18,7 +18,7 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -#include "util/util_optimization.h" +#include "util/optimization.h" #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 # define KERNEL_STUB diff --git a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp index 87baf04258a..c9424682fd4 100644 --- a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp +++ b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp @@ -18,7 +18,7 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -#include "util/util_optimization.h" +#include "util/optimization.h" #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 # define KERNEL_STUB diff --git a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp index bb421d58815..849ebf51989 100644 --- a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp +++ b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp @@ -18,7 +18,7 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -#include "util/util_optimization.h" +#include "util/optimization.h" #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 # define KERNEL_STUB diff --git a/intern/cycles/kernel/device/cuda/compat.h b/intern/cycles/kernel/device/cuda/compat.h index 8a50eb1a3d5..1ee82e6eb7c 100644 --- a/intern/cycles/kernel/device/cuda/compat.h +++ b/intern/cycles/kernel/device/cuda/compat.h @@ -137,5 +137,5 @@ __device__ float __half2float(const half h) /* Types */ -#include "util/util_half.h" -#include "util/util_types.h" +#include "util/half.h" +#include "util/types.h" diff --git a/intern/cycles/kernel/device/cuda/globals.h b/intern/cycles/kernel/device/cuda/globals.h index cde935198b3..e5023fad40c 100644 --- a/intern/cycles/kernel/device/cuda/globals.h +++ b/intern/cycles/kernel/device/cuda/globals.h @@ -18,11 +18,11 @@ #pragma once -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "kernel/integrator/integrator_state.h" +#include "kernel/integrator/state.h" -#include "kernel/util/util_profiling.h" +#include "kernel/util/profiling.h" CCL_NAMESPACE_BEGIN @@ -36,7 +36,7 @@ typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals; /* Global scene data and textures */ __constant__ KernelData __data; #define KERNEL_TEX(type, name) const __constant__ __device__ type *name; -#include "kernel/kernel_textures.h" +#include "kernel/textures.h" /* Integrator state */ __constant__ IntegratorStateGPU __integrator_state; diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index aa360b3016a..f86a8c692aa 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -21,26 +21,26 @@ #include "kernel/device/gpu/parallel_sorted_index.h" #include "kernel/device/gpu/work_stealing.h" -#include "kernel/integrator/integrator_state.h" -#include "kernel/integrator/integrator_state_flow.h" -#include "kernel/integrator/integrator_state_util.h" - -#include "kernel/integrator/integrator_init_from_bake.h" -#include "kernel/integrator/integrator_init_from_camera.h" -#include "kernel/integrator/integrator_intersect_closest.h" -#include "kernel/integrator/integrator_intersect_shadow.h" -#include "kernel/integrator/integrator_intersect_subsurface.h" -#include "kernel/integrator/integrator_intersect_volume_stack.h" -#include "kernel/integrator/integrator_shade_background.h" -#include "kernel/integrator/integrator_shade_light.h" -#include "kernel/integrator/integrator_shade_shadow.h" -#include "kernel/integrator/integrator_shade_surface.h" -#include "kernel/integrator/integrator_shade_volume.h" +#include "kernel/integrator/state.h" +#include "kernel/integrator/state_flow.h" +#include "kernel/integrator/state_util.h" + +#include "kernel/integrator/init_from_bake.h" +#include "kernel/integrator/init_from_camera.h" +#include "kernel/integrator/intersect_closest.h" +#include "kernel/integrator/intersect_shadow.h" +#include "kernel/integrator/intersect_subsurface.h" +#include "kernel/integrator/intersect_volume_stack.h" +#include "kernel/integrator/shade_background.h" +#include "kernel/integrator/shade_light.h" +#include "kernel/integrator/shade_shadow.h" +#include "kernel/integrator/shade_surface.h" +#include "kernel/integrator/shade_volume.h" #include "kernel/bake/bake.h" -#include "kernel/film/film_adaptive_sampling.h" -#include "kernel/film/film_read.h" +#include "kernel/film/adaptive_sampling.h" +#include "kernel/film/read.h" /* -------------------------------------------------------------------- * Integrator. diff --git a/intern/cycles/kernel/device/gpu/parallel_active_index.h b/intern/cycles/kernel/device/gpu/parallel_active_index.h index db4a4bf71e0..d7416beb783 100644 --- a/intern/cycles/kernel/device/gpu/parallel_active_index.h +++ b/intern/cycles/kernel/device/gpu/parallel_active_index.h @@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN * * Shared memory requirement is `sizeof(int) * (number_of_warps + 1)`. */ -#include "util/util_atomic.h" +#include "util/atomic.h" #ifdef __HIP__ # define GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE 1024 diff --git a/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h b/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h index aabe6e2e27a..6de3a022569 100644 --- a/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h +++ b/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h @@ -25,7 +25,7 @@ CCL_NAMESPACE_BEGIN * This is used for an array the size of the number of shaders in the scene * which is not usually huge, so might not be a significant bottleneck. */ -#include "util/util_atomic.h" +#include "util/atomic.h" #ifdef __HIP__ # define GPU_PARALLEL_PREFIX_SUM_DEFAULT_BLOCK_SIZE 1024 diff --git a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h index 7570c5a6bbd..c06d7be444f 100644 --- a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h +++ b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h @@ -24,7 +24,7 @@ CCL_NAMESPACE_BEGIN * * TODO: there may be ways to optimize this to avoid this many atomic ops? */ -#include "util/util_atomic.h" +#include "util/atomic.h" #ifdef __HIP__ # define GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE 1024 diff --git a/intern/cycles/kernel/device/hip/compat.h b/intern/cycles/kernel/device/hip/compat.h index 089976d84e4..282c3eca641 100644 --- a/intern/cycles/kernel/device/hip/compat.h +++ b/intern/cycles/kernel/device/hip/compat.h @@ -116,5 +116,5 @@ ccl_device_forceinline T ccl_gpu_tex_object_read_3D(const ccl_gpu_tex_object tex /* Types */ -#include "util/util_half.h" -#include "util/util_types.h" +#include "util/half.h" +#include "util/types.h" diff --git a/intern/cycles/kernel/device/hip/globals.h b/intern/cycles/kernel/device/hip/globals.h index 079944bd8f2..d9a560d668b 100644 --- a/intern/cycles/kernel/device/hip/globals.h +++ b/intern/cycles/kernel/device/hip/globals.h @@ -18,11 +18,11 @@ #pragma once -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "kernel/integrator/integrator_state.h" +#include "kernel/integrator/state.h" -#include "kernel/util/util_profiling.h" +#include "kernel/util/profiling.h" CCL_NAMESPACE_BEGIN @@ -36,7 +36,7 @@ typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals; /* Global scene data and textures */ __constant__ KernelData __data; #define KERNEL_TEX(type, name) __attribute__((used)) const __constant__ __device__ type *name; -#include "kernel/kernel_textures.h" +#include "kernel/textures.h" /* Integrator state */ __constant__ IntegratorStateGPU __integrator_state; diff --git a/intern/cycles/kernel/device/optix/compat.h b/intern/cycles/kernel/device/optix/compat.h index d27b7d55475..835e4621d47 100644 --- a/intern/cycles/kernel/device/optix/compat.h +++ b/intern/cycles/kernel/device/optix/compat.h @@ -129,5 +129,5 @@ __device__ float __half2float(const half h) /* Types */ -#include "util/util_half.h" -#include "util/util_types.h" +#include "util/half.h" +#include "util/types.h" diff --git a/intern/cycles/kernel/device/optix/globals.h b/intern/cycles/kernel/device/optix/globals.h index e038bc1797a..e9b72369cd5 100644 --- a/intern/cycles/kernel/device/optix/globals.h +++ b/intern/cycles/kernel/device/optix/globals.h @@ -18,11 +18,11 @@ #pragma once -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "kernel/integrator/integrator_state.h" +#include "kernel/integrator/state.h" -#include "kernel/util/util_profiling.h" +#include "kernel/util/profiling.h" CCL_NAMESPACE_BEGIN @@ -42,7 +42,7 @@ struct KernelParamsOptiX { /* Global scene data and textures */ KernelData data; #define KERNEL_TEX(type, name) const type *name; -#include "kernel/kernel_textures.h" +#include "kernel/textures.h" /* Integrator state */ IntegratorStateGPU __integrator_state; diff --git a/intern/cycles/kernel/device/optix/kernel.cu b/intern/cycles/kernel/device/optix/kernel.cu index a3bafb9846c..6989219cd9f 100644 --- a/intern/cycles/kernel/device/optix/kernel.cu +++ b/intern/cycles/kernel/device/optix/kernel.cu @@ -21,14 +21,14 @@ #include "kernel/device/gpu/image.h" /* Texture lookup uses normal CUDA intrinsics. */ -#include "kernel/integrator/integrator_state.h" -#include "kernel/integrator/integrator_state_flow.h" -#include "kernel/integrator/integrator_state_util.h" - -#include "kernel/integrator/integrator_intersect_closest.h" -#include "kernel/integrator/integrator_intersect_shadow.h" -#include "kernel/integrator/integrator_intersect_subsurface.h" -#include "kernel/integrator/integrator_intersect_volume_stack.h" +#include "kernel/integrator/state.h" +#include "kernel/integrator/state_flow.h" +#include "kernel/integrator/state_util.h" + +#include "kernel/integrator/intersect_closest.h" +#include "kernel/integrator/intersect_shadow.h" +#include "kernel/integrator/intersect_subsurface.h" +#include "kernel/integrator/intersect_volume_stack.h" // clang-format on diff --git a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu index bf787e29eaa..071e9deae0b 100644 --- a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu +++ b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu @@ -18,7 +18,8 @@ * much longer to compiler. This is only loaded when needed by the scene. */ #include "kernel/device/optix/kernel.cu" -#include "kernel/integrator/integrator_shade_surface.h" + +#include "kernel/integrator/shade_surface.h" extern "C" __global__ void __raygen__kernel_optix_integrator_shade_surface_raytrace() { diff --git a/intern/cycles/kernel/film/film_accumulate.h b/intern/cycles/kernel/film/accumulate.h index 91424fdbe21..30e1afea751 100644 --- a/intern/cycles/kernel/film/film_accumulate.h +++ b/intern/cycles/kernel/film/accumulate.h @@ -16,10 +16,10 @@ #pragma once -#include "kernel/film/film_adaptive_sampling.h" -#include "kernel/film/film_write_passes.h" +#include "kernel/film/adaptive_sampling.h" +#include "kernel/film/write_passes.h" -#include "kernel/integrator/integrator_shadow_catcher.h" +#include "kernel/integrator/shadow_catcher.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_adaptive_sampling.h b/intern/cycles/kernel/film/adaptive_sampling.h index c78b5f6b707..468c5d4486e 100644 --- a/intern/cycles/kernel/film/film_adaptive_sampling.h +++ b/intern/cycles/kernel/film/adaptive_sampling.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/film/film_write_passes.h" +#include "kernel/film/write_passes.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_id_passes.h b/intern/cycles/kernel/film/id_passes.h index d5b8c90a828..d5b8c90a828 100644 --- a/intern/cycles/kernel/film/film_id_passes.h +++ b/intern/cycles/kernel/film/id_passes.h diff --git a/intern/cycles/kernel/film/film_passes.h b/intern/cycles/kernel/film/passes.h index 6c124247f89..3a91d1653fe 100644 --- a/intern/cycles/kernel/film/film_passes.h +++ b/intern/cycles/kernel/film/passes.h @@ -18,8 +18,8 @@ #include "kernel/geom/geom.h" -#include "kernel/film/film_id_passes.h" -#include "kernel/film/film_write_passes.h" +#include "kernel/film/id_passes.h" +#include "kernel/film/write_passes.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_read.h b/intern/cycles/kernel/film/read.h index a87eff3832e..a87eff3832e 100644 --- a/intern/cycles/kernel/film/film_read.h +++ b/intern/cycles/kernel/film/read.h diff --git a/intern/cycles/kernel/film/film_write_passes.h b/intern/cycles/kernel/film/write_passes.h index 9d379495629..9d379495629 100644 --- a/intern/cycles/kernel/film/film_write_passes.h +++ b/intern/cycles/kernel/film/write_passes.h diff --git a/intern/cycles/kernel/geom/geom_attribute.h b/intern/cycles/kernel/geom/attribute.h index 848e0430caa..848e0430caa 100644 --- a/intern/cycles/kernel/geom/geom_attribute.h +++ b/intern/cycles/kernel/geom/attribute.h diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/curve.h index 7271193eef8..7271193eef8 100644 --- a/intern/cycles/kernel/geom/geom_curve.h +++ b/intern/cycles/kernel/geom/curve.h diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/curve_intersect.h index fb0b80b281f..fb0b80b281f 100644 --- a/intern/cycles/kernel/geom/geom_curve_intersect.h +++ b/intern/cycles/kernel/geom/curve_intersect.h diff --git a/intern/cycles/kernel/geom/geom.h b/intern/cycles/kernel/geom/geom.h index 4de824cc277..9d023375a35 100644 --- a/intern/cycles/kernel/geom/geom.h +++ b/intern/cycles/kernel/geom/geom.h @@ -17,21 +17,21 @@ #pragma once // clang-format off -#include "kernel/geom/geom_attribute.h" -#include "kernel/geom/geom_object.h" +#include "kernel/geom/attribute.h" +#include "kernel/geom/object.h" #ifdef __PATCH_EVAL__ -# include "kernel/geom/geom_patch.h" +# include "kernel/geom/patch.h" #endif -#include "kernel/geom/geom_triangle.h" -#include "kernel/geom/geom_subd_triangle.h" -#include "kernel/geom/geom_triangle_intersect.h" -#include "kernel/geom/geom_motion_triangle.h" -#include "kernel/geom/geom_motion_triangle_intersect.h" -#include "kernel/geom/geom_motion_triangle_shader.h" -#include "kernel/geom/geom_motion_curve.h" -#include "kernel/geom/geom_curve.h" -#include "kernel/geom/geom_curve_intersect.h" -#include "kernel/geom/geom_volume.h" -#include "kernel/geom/geom_primitive.h" -#include "kernel/geom/geom_shader_data.h" +#include "kernel/geom/triangle.h" +#include "kernel/geom/subd_triangle.h" +#include "kernel/geom/triangle_intersect.h" +#include "kernel/geom/motion_triangle.h" +#include "kernel/geom/motion_triangle_intersect.h" +#include "kernel/geom/motion_triangle_shader.h" +#include "kernel/geom/motion_curve.h" +#include "kernel/geom/curve.h" +#include "kernel/geom/curve_intersect.h" +#include "kernel/geom/volume.h" +#include "kernel/geom/primitive.h" +#include "kernel/geom/shader_data.h" // clang-format on diff --git a/intern/cycles/kernel/geom/geom_motion_curve.h b/intern/cycles/kernel/geom/motion_curve.h index 2dd213d43f6..2dd213d43f6 100644 --- a/intern/cycles/kernel/geom/geom_motion_curve.h +++ b/intern/cycles/kernel/geom/motion_curve.h diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/motion_triangle.h index 69d15f950ec..43f894938e0 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle.h +++ b/intern/cycles/kernel/geom/motion_triangle.h @@ -27,7 +27,7 @@ #pragma once -#include "kernel/bvh/bvh_util.h" +#include "kernel/bvh/util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h b/intern/cycles/kernel/geom/motion_triangle_intersect.h index 256e7add21e..256e7add21e 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h +++ b/intern/cycles/kernel/geom/motion_triangle_intersect.h diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h b/intern/cycles/kernel/geom/motion_triangle_shader.h index fc7c181882e..fc7c181882e 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h +++ b/intern/cycles/kernel/geom/motion_triangle_shader.h diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/object.h index 34a9d639d9d..34a9d639d9d 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/object.h diff --git a/intern/cycles/kernel/geom/geom_patch.h b/intern/cycles/kernel/geom/patch.h index bf1a06220aa..7d24937a41e 100644 --- a/intern/cycles/kernel/geom/geom_patch.h +++ b/intern/cycles/kernel/geom/patch.h @@ -26,7 +26,7 @@ #pragma once -#include "util/util_color.h" +#include "util/color.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/primitive.h index bc559e3c812..7a8921b6d6e 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/primitive.h @@ -21,7 +21,7 @@ #pragma once -#include "kernel/camera/camera_projection.h" +#include "kernel/camera/projection.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom_shader_data.h b/intern/cycles/kernel/geom/shader_data.h index 46bda2b656c..46bda2b656c 100644 --- a/intern/cycles/kernel/geom/geom_shader_data.h +++ b/intern/cycles/kernel/geom/shader_data.h diff --git a/intern/cycles/kernel/geom/geom_subd_triangle.h b/intern/cycles/kernel/geom/subd_triangle.h index 8a9a3f71231..8a9a3f71231 100644 --- a/intern/cycles/kernel/geom/geom_subd_triangle.h +++ b/intern/cycles/kernel/geom/subd_triangle.h diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/triangle.h index 233e901c7ca..233e901c7ca 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/triangle.h diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/triangle_intersect.h index 440dc23d124..faff8a85a93 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/triangle_intersect.h @@ -22,7 +22,7 @@ #pragma once -#include "kernel/sample/sample_lcg.h" +#include "kernel/sample/lcg.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/volume.h index 4e83ad6acb3..4e83ad6acb3 100644 --- a/intern/cycles/kernel/geom/geom_volume.h +++ b/intern/cycles/kernel/geom/volume.h diff --git a/intern/cycles/kernel/integrator/integrator_init_from_bake.h b/intern/cycles/kernel/integrator/init_from_bake.h index 5790cfd3f22..4e30563e21b 100644 --- a/intern/cycles/kernel/integrator/integrator_init_from_bake.h +++ b/intern/cycles/kernel/integrator/init_from_bake.h @@ -18,12 +18,12 @@ #include "kernel/camera/camera.h" -#include "kernel/film/film_accumulate.h" -#include "kernel/film/film_adaptive_sampling.h" +#include "kernel/film/accumulate.h" +#include "kernel/film/adaptive_sampling.h" -#include "kernel/integrator/integrator_path_state.h" +#include "kernel/integrator/path_state.h" -#include "kernel/sample/sample_pattern.h" +#include "kernel/sample/pattern.h" #include "kernel/geom/geom.h" diff --git a/intern/cycles/kernel/integrator/integrator_init_from_camera.h b/intern/cycles/kernel/integrator/init_from_camera.h index 499a72ffbc4..f0ba77bd9a6 100644 --- a/intern/cycles/kernel/integrator/integrator_init_from_camera.h +++ b/intern/cycles/kernel/integrator/init_from_camera.h @@ -18,13 +18,13 @@ #include "kernel/camera/camera.h" -#include "kernel/film/film_accumulate.h" -#include "kernel/film/film_adaptive_sampling.h" +#include "kernel/film/accumulate.h" +#include "kernel/film/adaptive_sampling.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shadow_catcher.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shadow_catcher.h" -#include "kernel/sample/sample_pattern.h" +#include "kernel/sample/pattern.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_intersect_closest.h b/intern/cycles/kernel/integrator/intersect_closest.h index 41d3dfde41a..d5a9df9669b 100644 --- a/intern/cycles/kernel/integrator/integrator_intersect_closest.h +++ b/intern/cycles/kernel/integrator/intersect_closest.h @@ -16,14 +16,14 @@ #pragma once -#include "kernel/camera/camera_projection.h" +#include "kernel/camera/projection.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shadow_catcher.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shadow_catcher.h" #include "kernel/light/light.h" -#include "kernel/util/util_differential.h" +#include "kernel/util/differential.h" #include "kernel/geom/geom.h" diff --git a/intern/cycles/kernel/integrator/integrator_intersect_shadow.h b/intern/cycles/kernel/integrator/intersect_shadow.h index 90422445fad..90422445fad 100644 --- a/intern/cycles/kernel/integrator/integrator_intersect_shadow.h +++ b/intern/cycles/kernel/integrator/intersect_shadow.h diff --git a/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h b/intern/cycles/kernel/integrator/intersect_subsurface.h index b575e7fd1e6..27b8e1e5f5a 100644 --- a/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h +++ b/intern/cycles/kernel/integrator/intersect_subsurface.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/integrator/integrator_subsurface.h" +#include "kernel/integrator/subsurface.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h b/intern/cycles/kernel/integrator/intersect_volume_stack.h index 505d9687948..1c91318ff9c 100644 --- a/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h +++ b/intern/cycles/kernel/integrator/intersect_volume_stack.h @@ -18,8 +18,8 @@ #include "kernel/bvh/bvh.h" #include "kernel/geom/geom.h" -#include "kernel/integrator/integrator_shader_eval.h" -#include "kernel/integrator/integrator_volume_stack.h" +#include "kernel/integrator/shader_eval.h" +#include "kernel/integrator/volume_stack.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_megakernel.h b/intern/cycles/kernel/integrator/megakernel.h index 21a483a792b..d8cc794dc7a 100644 --- a/intern/cycles/kernel/integrator/integrator_megakernel.h +++ b/intern/cycles/kernel/integrator/megakernel.h @@ -16,16 +16,16 @@ #pragma once -#include "kernel/integrator/integrator_init_from_camera.h" -#include "kernel/integrator/integrator_intersect_closest.h" -#include "kernel/integrator/integrator_intersect_shadow.h" -#include "kernel/integrator/integrator_intersect_subsurface.h" -#include "kernel/integrator/integrator_intersect_volume_stack.h" -#include "kernel/integrator/integrator_shade_background.h" -#include "kernel/integrator/integrator_shade_light.h" -#include "kernel/integrator/integrator_shade_shadow.h" -#include "kernel/integrator/integrator_shade_surface.h" -#include "kernel/integrator/integrator_shade_volume.h" +#include "kernel/integrator/init_from_camera.h" +#include "kernel/integrator/intersect_closest.h" +#include "kernel/integrator/intersect_shadow.h" +#include "kernel/integrator/intersect_subsurface.h" +#include "kernel/integrator/intersect_volume_stack.h" +#include "kernel/integrator/shade_background.h" +#include "kernel/integrator/shade_light.h" +#include "kernel/integrator/shade_shadow.h" +#include "kernel/integrator/shade_surface.h" +#include "kernel/integrator/shade_volume.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_path_state.h b/intern/cycles/kernel/integrator/path_state.h index 73062b26682..8311b97dedb 100644 --- a/intern/cycles/kernel/integrator/integrator_path_state.h +++ b/intern/cycles/kernel/integrator/path_state.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/sample/sample_pattern.h" +#include "kernel/sample/pattern.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shade_background.h b/intern/cycles/kernel/integrator/shade_background.h index b3bef9a234e..71a590749bd 100644 --- a/intern/cycles/kernel/integrator/integrator_shade_background.h +++ b/intern/cycles/kernel/integrator/shade_background.h @@ -16,11 +16,11 @@ #pragma once -#include "kernel/film/film_accumulate.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/film/accumulate.h" +#include "kernel/integrator/shader_eval.h" #include "kernel/light/light.h" -#include "kernel/light/light_sample.h" -#include "kernel/sample/sample_mis.h" +#include "kernel/light/sample.h" +#include "kernel/sample/mis.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shade_light.h b/intern/cycles/kernel/integrator/shade_light.h index 7d220006322..7dad3b4e49d 100644 --- a/intern/cycles/kernel/integrator/integrator_shade_light.h +++ b/intern/cycles/kernel/integrator/shade_light.h @@ -16,10 +16,10 @@ #pragma once -#include "kernel/film/film_accumulate.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/film/accumulate.h" +#include "kernel/integrator/shader_eval.h" #include "kernel/light/light.h" -#include "kernel/light/light_sample.h" +#include "kernel/light/sample.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shade_shadow.h b/intern/cycles/kernel/integrator/shade_shadow.h index 0c4eeb8d10d..1de890aae29 100644 --- a/intern/cycles/kernel/integrator/integrator_shade_shadow.h +++ b/intern/cycles/kernel/integrator/shade_shadow.h @@ -16,9 +16,9 @@ #pragma once -#include "kernel/integrator/integrator_shade_volume.h" -#include "kernel/integrator/integrator_volume_stack.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/integrator/shade_volume.h" +#include "kernel/integrator/shader_eval.h" +#include "kernel/integrator/volume_stack.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h index 70dce1c4913..cce591eb219 100644 --- a/intern/cycles/kernel/integrator/integrator_shade_surface.h +++ b/intern/cycles/kernel/integrator/shade_surface.h @@ -16,18 +16,18 @@ #pragma once -#include "kernel/film/film_accumulate.h" -#include "kernel/film/film_passes.h" +#include "kernel/film/accumulate.h" +#include "kernel/film/passes.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" -#include "kernel/integrator/integrator_subsurface.h" -#include "kernel/integrator/integrator_volume_stack.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" +#include "kernel/integrator/subsurface.h" +#include "kernel/integrator/volume_stack.h" #include "kernel/light/light.h" -#include "kernel/light/light_sample.h" +#include "kernel/light/sample.h" -#include "kernel/sample/sample_mis.h" +#include "kernel/sample/mis.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h index 44ef4803575..f455152dcf9 100644 --- a/intern/cycles/kernel/integrator/integrator_shade_volume.h +++ b/intern/cycles/kernel/integrator/shade_volume.h @@ -16,18 +16,18 @@ #pragma once -#include "kernel/film/film_accumulate.h" -#include "kernel/film/film_passes.h" +#include "kernel/film/accumulate.h" +#include "kernel/film/passes.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" -#include "kernel/integrator/integrator_intersect_closest.h" -#include "kernel/integrator/integrator_volume_stack.h" +#include "kernel/integrator/intersect_closest.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" +#include "kernel/integrator/volume_stack.h" #include "kernel/light/light.h" -#include "kernel/light/light_sample.h" +#include "kernel/light/sample.h" -#include "kernel/sample/sample_mis.h" +#include "kernel/sample/mis.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shader_eval.h b/intern/cycles/kernel/integrator/shader_eval.h index 04a3a965fd3..68f1ef8c118 100644 --- a/intern/cycles/kernel/integrator/integrator_shader_eval.h +++ b/intern/cycles/kernel/integrator/shader_eval.h @@ -19,16 +19,16 @@ #pragma once #include "kernel/closure/alloc.h" -#include "kernel/closure/bsdf_util.h" #include "kernel/closure/bsdf.h" +#include "kernel/closure/bsdf_util.h" #include "kernel/closure/emissive.h" -#include "kernel/film/film_accumulate.h" +#include "kernel/film/accumulate.h" #include "kernel/svm/svm.h" #ifdef __OSL__ -# include "kernel/osl/osl_shader.h" +# include "kernel/osl/shader.h" #endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shadow_catcher.h b/intern/cycles/kernel/integrator/shadow_catcher.h index 24d03466393..7beae235dbc 100644 --- a/intern/cycles/kernel/integrator/integrator_shadow_catcher.h +++ b/intern/cycles/kernel/integrator/shadow_catcher.h @@ -16,8 +16,8 @@ #pragma once -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_state_util.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/state_util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_shadow_state_template.h b/intern/cycles/kernel/integrator/shadow_state_template.h index 1fbadde2642..1fbadde2642 100644 --- a/intern/cycles/kernel/integrator/integrator_shadow_state_template.h +++ b/intern/cycles/kernel/integrator/shadow_state_template.h diff --git a/intern/cycles/kernel/integrator/integrator_state.h b/intern/cycles/kernel/integrator/state.h index 09b399ff1b8..86dac0a65cf 100644 --- a/intern/cycles/kernel/integrator/integrator_state.h +++ b/intern/cycles/kernel/integrator/state.h @@ -40,9 +40,9 @@ * INTEGRATOR_STATE_NULL: use to pass empty state to other functions. */ -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "util/util_types.h" +#include "util/types.h" #pragma once @@ -64,7 +64,7 @@ typedef struct IntegratorShadowStateCPU { } \ name[cpu_size]; #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE -#include "kernel/integrator/integrator_shadow_state_template.h" +#include "kernel/integrator/shadow_state_template.h" #undef KERNEL_STRUCT_BEGIN #undef KERNEL_STRUCT_MEMBER #undef KERNEL_STRUCT_ARRAY_MEMBER @@ -83,7 +83,7 @@ typedef struct IntegratorStateCPU { } \ name[cpu_size]; #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE -#include "kernel/integrator/integrator_state_template.h" +#include "kernel/integrator/state_template.h" #undef KERNEL_STRUCT_BEGIN #undef KERNEL_STRUCT_MEMBER #undef KERNEL_STRUCT_ARRAY_MEMBER @@ -118,9 +118,9 @@ typedef struct IntegratorStateGPU { name[gpu_size]; #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE -#include "kernel/integrator/integrator_state_template.h" +#include "kernel/integrator/state_template.h" -#include "kernel/integrator/integrator_shadow_state_template.h" +#include "kernel/integrator/shadow_state_template.h" #undef KERNEL_STRUCT_BEGIN #undef KERNEL_STRUCT_MEMBER diff --git a/intern/cycles/kernel/integrator/integrator_state_flow.h b/intern/cycles/kernel/integrator/state_flow.h index 1569bf68e24..38a2b396847 100644 --- a/intern/cycles/kernel/integrator/integrator_state_flow.h +++ b/intern/cycles/kernel/integrator/state_flow.h @@ -16,8 +16,8 @@ #pragma once -#include "kernel/kernel_types.h" -#include "util/util_atomic.h" +#include "kernel/types.h" +#include "util/atomic.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_state_template.h b/intern/cycles/kernel/integrator/state_template.h index b1a6fd36fae..b1a6fd36fae 100644 --- a/intern/cycles/kernel/integrator/integrator_state_template.h +++ b/intern/cycles/kernel/integrator/state_template.h diff --git a/intern/cycles/kernel/integrator/integrator_state_util.h b/intern/cycles/kernel/integrator/state_util.h index 0b1f67daa92..dafe06e7009 100644 --- a/intern/cycles/kernel/integrator/integrator_state_util.h +++ b/intern/cycles/kernel/integrator/state_util.h @@ -16,9 +16,9 @@ #pragma once -#include "kernel/integrator/integrator_state.h" +#include "kernel/integrator/state.h" -#include "kernel/util/util_differential.h" +#include "kernel/util/differential.h" CCL_NAMESPACE_BEGIN @@ -247,7 +247,7 @@ ccl_device_inline void integrator_state_copy_only(KernelGlobals kg, # define KERNEL_STRUCT_VOLUME_STACK_SIZE kernel_data.volume_stack_size -# include "kernel/integrator/integrator_state_template.h" +# include "kernel/integrator/state_template.h" # undef KERNEL_STRUCT_BEGIN # undef KERNEL_STRUCT_MEMBER @@ -303,7 +303,7 @@ ccl_device_inline void integrator_shadow_state_copy_only(KernelGlobals kg, # define KERNEL_STRUCT_VOLUME_STACK_SIZE kernel_data.volume_stack_size -# include "kernel/integrator/integrator_shadow_state_template.h" +# include "kernel/integrator/shadow_state_template.h" # undef KERNEL_STRUCT_BEGIN # undef KERNEL_STRUCT_MEMBER diff --git a/intern/cycles/kernel/integrator/integrator_subsurface.h b/intern/cycles/kernel/integrator/subsurface.h index 9560641c460..49466112387 100644 --- a/intern/cycles/kernel/integrator/integrator_subsurface.h +++ b/intern/cycles/kernel/integrator/subsurface.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/camera/camera_projection.h" +#include "kernel/camera/projection.h" #include "kernel/bvh/bvh.h" @@ -26,11 +26,11 @@ #include "kernel/closure/bssrdf.h" #include "kernel/closure/volume.h" -#include "kernel/integrator/integrator_intersect_volume_stack.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" -#include "kernel/integrator/integrator_subsurface_disk.h" -#include "kernel/integrator/integrator_subsurface_random_walk.h" +#include "kernel/integrator/intersect_volume_stack.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" +#include "kernel/integrator/subsurface_disk.h" +#include "kernel/integrator/subsurface_random_walk.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/integrator/integrator_subsurface_disk.h b/intern/cycles/kernel/integrator/subsurface_disk.h index e1cce13fb30..e1cce13fb30 100644 --- a/intern/cycles/kernel/integrator/integrator_subsurface_disk.h +++ b/intern/cycles/kernel/integrator/subsurface_disk.h diff --git a/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h b/intern/cycles/kernel/integrator/subsurface_random_walk.h index b98acda1f4d..f0712758174 100644 --- a/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h +++ b/intern/cycles/kernel/integrator/subsurface_random_walk.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/camera/camera_projection.h" +#include "kernel/camera/projection.h" #include "kernel/bvh/bvh.h" diff --git a/intern/cycles/kernel/integrator/integrator_volume_stack.h b/intern/cycles/kernel/integrator/volume_stack.h index cf69826ffff..cf69826ffff 100644 --- a/intern/cycles/kernel/integrator/integrator_volume_stack.h +++ b/intern/cycles/kernel/integrator/volume_stack.h diff --git a/intern/cycles/kernel/light/light_background.h b/intern/cycles/kernel/light/background.h index 78f8c94f7a3..d801cc94393 100644 --- a/intern/cycles/kernel/light/light_background.h +++ b/intern/cycles/kernel/light/background.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/light/light_common.h" +#include "kernel/light/common.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light_common.h b/intern/cycles/kernel/light/common.h index 207e89090cc..75331d32d44 100644 --- a/intern/cycles/kernel/light/light_common.h +++ b/intern/cycles/kernel/light/common.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light.h b/intern/cycles/kernel/light/light.h index facbbe23d0f..746c7747569 100644 --- a/intern/cycles/kernel/light/light.h +++ b/intern/cycles/kernel/light/light.h @@ -17,8 +17,8 @@ #pragma once #include "kernel/geom/geom.h" -#include "kernel/light/light_background.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/light/background.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light_sample.h b/intern/cycles/kernel/light/sample.h index 4ae5d9e1944..6b643a95250 100644 --- a/intern/cycles/kernel/light/light_sample.h +++ b/intern/cycles/kernel/light/sample.h @@ -16,12 +16,12 @@ #pragma once -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" #include "kernel/light/light.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index 7be1b7129e0..f226c95766f 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/intern/cycles/kernel/osl/CMakeLists.txt @@ -25,17 +25,17 @@ set(SRC bsdf_diffuse_ramp.cpp bsdf_phong_ramp.cpp emissive.cpp - osl_bssrdf.cpp - osl_closures.cpp - osl_services.cpp - osl_shader.cpp + bssrdf.cpp + closures.cpp + services.cpp + shader.cpp ) set(HEADER_SRC - osl_closures.h - osl_globals.h - osl_services.h - osl_shader.h + closures.h + globals.h + services.h + shader.h ) set(LIB diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp index bb290a5ced2..540180f99e8 100644 --- a/intern/cycles/kernel/osl/background.cpp +++ b/intern/cycles/kernel/osl/background.cpp @@ -34,7 +34,7 @@ #include <OSL/genclosure.h> -#include "kernel/osl/osl_closures.h" +#include "kernel/osl/closures.h" // clang-format off #include "kernel/device/cpu/compat.h" diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp index 2ec7f14c0fa..768531a0bf9 100644 --- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp @@ -35,10 +35,10 @@ #include <OSL/genclosure.h> #include "kernel/device/cpu/compat.h" -#include "kernel/osl/osl_closures.h" +#include "kernel/osl/closures.h" // clang-format off -#include "kernel/kernel_types.h" +#include "kernel/types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_diffuse_ramp.h" // clang-format on diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp index 90160fba962..d34a33216a0 100644 --- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp +++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp @@ -35,10 +35,10 @@ #include <OSL/genclosure.h> #include "kernel/device/cpu/compat.h" -#include "kernel/osl/osl_closures.h" +#include "kernel/osl/closures.h" // clang-format off -#include "kernel/kernel_types.h" +#include "kernel/types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_phong_ramp.h" // clang-format on diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/bssrdf.cpp index 3b8661ce45d..7c7f1ce157f 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.cpp +++ b/intern/cycles/kernel/osl/bssrdf.cpp @@ -33,10 +33,10 @@ #include <OSL/genclosure.h> #include "kernel/device/cpu/compat.h" -#include "kernel/osl/osl_closures.h" +#include "kernel/osl/closures.h" // clang-format off -#include "kernel/kernel_types.h" +#include "kernel/types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_util.h" diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/closures.cpp index 89bab35b60b..adc0f50aefb 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/closures.cpp @@ -33,17 +33,17 @@ #include <OSL/genclosure.h> #include <OSL/oslclosure.h> -#include "kernel/osl/osl_closures.h" -#include "kernel/osl/osl_shader.h" +#include "kernel/osl/closures.h" +#include "kernel/osl/shader.h" -#include "util/util_math.h" -#include "util/util_param.h" +#include "util/math.h" +#include "util/param.h" // clang-format off #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/globals.h" -#include "kernel/kernel_types.h" +#include "kernel/types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/bsdf_util.h" diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/closures.h index 7869d793737..8f573e89734 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/closures.h @@ -33,8 +33,8 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ -#include "kernel/kernel_types.h" -#include "util/util_types.h" +#include "kernel/types.h" +#include "util/types.h" #include <OSL/genclosure.h> #include <OSL/oslclosure.h> diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp index 5a7fe14b22e..2615e300a92 100644 --- a/intern/cycles/kernel/osl/emissive.cpp +++ b/intern/cycles/kernel/osl/emissive.cpp @@ -34,11 +34,11 @@ #include <OSL/genclosure.h> -#include "kernel/osl/osl_closures.h" +#include "kernel/osl/closures.h" // clang-format off #include "kernel/device/cpu/compat.h" -#include "kernel/kernel_types.h" +#include "kernel/types.h" #include "kernel/closure/alloc.h" #include "kernel/closure/emissive.h" // clang-format on diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/globals.h index f1789f0d7eb..126ace0086e 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/globals.h @@ -24,11 +24,11 @@ # include <OpenImageIO/refcnt.h> # include <OpenImageIO/unordered_map_concurrent.h> -# include "util/util_map.h" -# include "util/util_param.h" -# include "util/util_thread.h" -# include "util/util_unique_ptr.h" -# include "util/util_vector.h" +# include "util/map.h" +# include "util/param.h" +# include "util/thread.h" +# include "util/unique_ptr.h" +# include "util/vector.h" # ifndef WIN32 using std::isfinite; diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/services.cpp index 56b04fd280e..ca0a5a068b3 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/services.cpp @@ -30,36 +30,36 @@ #include "scene/object.h" #include "scene/scene.h" -#include "kernel/osl/osl_closures.h" -#include "kernel/osl/osl_globals.h" -#include "kernel/osl/osl_services.h" -#include "kernel/osl/osl_shader.h" +#include "kernel/osl/closures.h" +#include "kernel/osl/globals.h" +#include "kernel/osl/services.h" +#include "kernel/osl/shader.h" -#include "util/util_foreach.h" -#include "util/util_logging.h" -#include "util/util_string.h" +#include "util/foreach.h" +#include "util/log.h" +#include "util/string.h" // clang-format off #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/globals.h" #include "kernel/device/cpu/image.h" -#include "kernel/util/util_differential.h" +#include "kernel/util/differential.h" -#include "kernel/integrator/integrator_state.h" -#include "kernel/integrator/integrator_state_flow.h" +#include "kernel/integrator/state.h" +#include "kernel/integrator/state_flow.h" #include "kernel/geom/geom.h" #include "kernel/bvh/bvh.h" #include "kernel/camera/camera.h" -#include "kernel/camera/camera_projection.h" +#include "kernel/camera/projection.h" -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" -#include "kernel/util/util_color.h" +#include "kernel/util/color.h" // clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/services.h index d9f57c642ad..d9f57c642ad 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/services.h diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/shader.cpp index 6426a09b33d..33633c69e29 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/shader.cpp @@ -20,16 +20,16 @@ #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/globals.h" -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "kernel/geom/geom_object.h" +#include "kernel/geom/object.h" -#include "kernel/integrator/integrator_state.h" +#include "kernel/integrator/state.h" -#include "kernel/osl/osl_closures.h" -#include "kernel/osl/osl_globals.h" -#include "kernel/osl/osl_services.h" -#include "kernel/osl/osl_shader.h" +#include "kernel/osl/closures.h" +#include "kernel/osl/globals.h" +#include "kernel/osl/services.h" +#include "kernel/osl/shader.h" // clang-format on #include "scene/attribute.h" diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/shader.h index 037a18a1f19..7d68d4eae7f 100644 --- a/intern/cycles/kernel/osl/osl_shader.h +++ b/intern/cycles/kernel/osl/shader.h @@ -29,7 +29,7 @@ * This means no thread state must be passed along in the kernel itself. */ -# include "kernel/kernel_types.h" +# include "kernel/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/sample/sample_jitter.h b/intern/cycles/kernel/sample/jitter.h index b62ec7fda42..b62ec7fda42 100644 --- a/intern/cycles/kernel/sample/sample_jitter.h +++ b/intern/cycles/kernel/sample/jitter.h diff --git a/intern/cycles/kernel/sample/lcg.h b/intern/cycles/kernel/sample/lcg.h new file mode 100644 index 00000000000..92cfff639b4 --- /dev/null +++ b/intern/cycles/kernel/sample/lcg.h @@ -0,0 +1,51 @@ +/* + * Copyright 2011-2013 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once + +CCL_NAMESPACE_BEGIN + +/* Linear Congruential Generator */ + +ccl_device uint lcg_step_uint(uint *rng) +{ + /* implicit mod 2^32 */ + *rng = (1103515245 * (*rng) + 12345); + return *rng; +} + +ccl_device float lcg_step_float(uint *rng) +{ + /* implicit mod 2^32 */ + *rng = (1103515245 * (*rng) + 12345); + return (float)*rng * (1.0f / (float)0xFFFFFFFF); +} + +ccl_device uint lcg_init(uint seed) +{ + uint rng = seed; + lcg_step_uint(&rng); + return rng; +} + +ccl_device_inline uint lcg_state_init(const uint rng_hash, + const uint rng_offset, + const uint sample, + const uint scramble) +{ + return lcg_init(rng_hash + rng_offset + sample * scramble); +} + +CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/sample/sample_mapping.h b/intern/cycles/kernel/sample/mapping.h index 3297aa2a29a..3297aa2a29a 100644 --- a/intern/cycles/kernel/sample/sample_mapping.h +++ b/intern/cycles/kernel/sample/mapping.h diff --git a/intern/cycles/kernel/sample/mis.h b/intern/cycles/kernel/sample/mis.h new file mode 100644 index 00000000000..0878b3aac36 --- /dev/null +++ b/intern/cycles/kernel/sample/mis.h @@ -0,0 +1,64 @@ +/* + * Parts adapted from Open Shading Language with this license: + * + * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. + * All Rights Reserved. + * + * Modifications Copyright 2011, Blender Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Sony Pictures Imageworks nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +CCL_NAMESPACE_BEGIN + +/* Multiple importance sampling utilities. */ + +ccl_device float balance_heuristic(float a, float b) +{ + return (a) / (a + b); +} + +ccl_device float balance_heuristic_3(float a, float b, float c) +{ + return (a) / (a + b + c); +} + +ccl_device float power_heuristic(float a, float b) +{ + return (a * a) / (a * a + b * b); +} + +ccl_device float power_heuristic_3(float a, float b, float c) +{ + return (a * a) / (a * a + b * b + c * c); +} + +ccl_device float max_heuristic(float a, float b) +{ + return (a > b) ? 1.0f : 0.0f; +} + +CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/sample/sample_pattern.h b/intern/cycles/kernel/sample/pattern.h index 95635c2c855..191b24a5f2a 100644 --- a/intern/cycles/kernel/sample/sample_pattern.h +++ b/intern/cycles/kernel/sample/pattern.h @@ -15,8 +15,8 @@ */ #pragma once -#include "kernel/sample/sample_jitter.h" -#include "util/util_hash.h" +#include "kernel/sample/jitter.h" +#include "util/hash.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_ao.h b/intern/cycles/kernel/svm/ao.h index 4cfef7bc204..678f49c8ccd 100644 --- a/intern/cycles/kernel/svm/svm_ao.h +++ b/intern/cycles/kernel/svm/ao.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + #include "kernel/bvh/bvh.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_aov.h b/intern/cycles/kernel/svm/aov.h index 92be7fb6906..21ee7af7639 100644 --- a/intern/cycles/kernel/svm/svm_aov.h +++ b/intern/cycles/kernel/svm/aov.h @@ -14,7 +14,9 @@ * limitations under the License. */ -#include "kernel/film/film_write_passes.h" +#pragma once + +#include "kernel/film/write_passes.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/attribute.h index b3c66d29f5c..e9de0164c7a 100644 --- a/intern/cycles/kernel/svm/svm_attribute.h +++ b/intern/cycles/kernel/svm/attribute.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Attribute Node */ diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/bevel.h index 0a30822aa68..37c7caf1372 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/bevel.h @@ -14,9 +14,11 @@ * limitations under the License. */ +#pragma once + #include "kernel/bvh/bvh.h" -#include "kernel/sample/sample_mapping.h" -#include "kernel/sample/sample_pattern.h" +#include "kernel/sample/mapping.h" +#include "kernel/sample/pattern.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_blackbody.h b/intern/cycles/kernel/svm/blackbody.h index f1adb0e76af..da15550f918 100644 --- a/intern/cycles/kernel/svm/svm_blackbody.h +++ b/intern/cycles/kernel/svm/blackbody.h @@ -30,6 +30,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma once + +#include "kernel/svm/math_util.h" + CCL_NAMESPACE_BEGIN /* Blackbody Node */ diff --git a/intern/cycles/kernel/svm/svm_brick.h b/intern/cycles/kernel/svm/brick.h index 9dc31ef37ec..3c8729fa027 100644 --- a/intern/cycles/kernel/svm/svm_brick.h +++ b/intern/cycles/kernel/svm/brick.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Brick */ diff --git a/intern/cycles/kernel/svm/svm_brightness.h b/intern/cycles/kernel/svm/brightness.h index 0a44ffe6359..5c82a4347cd 100644 --- a/intern/cycles/kernel/svm/svm_brightness.h +++ b/intern/cycles/kernel/svm/brightness.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#pragma once + +#include "kernel/svm/color_util.h" + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_brightness( diff --git a/intern/cycles/kernel/svm/svm_bump.h b/intern/cycles/kernel/svm/bump.h index 66e5b665532..2fae06fa54b 100644 --- a/intern/cycles/kernel/svm/svm_bump.h +++ b/intern/cycles/kernel/svm/bump.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Bump Eval Nodes */ diff --git a/intern/cycles/kernel/svm/svm_camera.h b/intern/cycles/kernel/svm/camera.h index 787f11f38b5..c71c02e6b19 100644 --- a/intern/cycles/kernel/svm/svm_camera.h +++ b/intern/cycles/kernel/svm/camera.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_camera(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_checker.h b/intern/cycles/kernel/svm/checker.h index 9251d90c0e1..a79b1651f44 100644 --- a/intern/cycles/kernel/svm/svm_checker.h +++ b/intern/cycles/kernel/svm/checker.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Checker */ diff --git a/intern/cycles/kernel/svm/svm_clamp.h b/intern/cycles/kernel/svm/clamp.h index 5b5ea784f4a..c07c0206d29 100644 --- a/intern/cycles/kernel/svm/svm_clamp.h +++ b/intern/cycles/kernel/svm/clamp.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Clamp Node */ diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/closure.h index 3378832c233..1dcfe003f74 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/closure.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Closure Nodes */ diff --git a/intern/cycles/kernel/svm/svm_color_util.h b/intern/cycles/kernel/svm/color_util.h index 1a0fa03305e..82024b61ba4 100644 --- a/intern/cycles/kernel/svm/svm_color_util.h +++ b/intern/cycles/kernel/svm/color_util.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device float3 svm_mix_blend(float t, float3 col1, float3 col2) diff --git a/intern/cycles/kernel/svm/svm_convert.h b/intern/cycles/kernel/svm/convert.h index ec5745dc78a..427ffd97f59 100644 --- a/intern/cycles/kernel/svm/svm_convert.h +++ b/intern/cycles/kernel/svm/convert.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Conversion Nodes */ diff --git a/intern/cycles/kernel/svm/svm_displace.h b/intern/cycles/kernel/svm/displace.h index 8429fe1d3e0..cea1436f36d 100644 --- a/intern/cycles/kernel/svm/svm_displace.h +++ b/intern/cycles/kernel/svm/displace.h @@ -14,7 +14,9 @@ * limitations under the License. */ -#include "kernel/sample/sample_mapping.h" +#pragma once + +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_fractal_noise.h b/intern/cycles/kernel/svm/fractal_noise.h index 57fa8c690ac..b955d626dde 100644 --- a/intern/cycles/kernel/svm/svm_fractal_noise.h +++ b/intern/cycles/kernel/svm/fractal_noise.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#pragma once + +#include "kernel/svm/noise.h" + CCL_NAMESPACE_BEGIN /* The fractal_noise_[1-4] functions are all exactly the same except for the input type. */ diff --git a/intern/cycles/kernel/svm/svm_fresnel.h b/intern/cycles/kernel/svm/fresnel.h index 449ec84370f..9dd68c3e38f 100644 --- a/intern/cycles/kernel/svm/svm_fresnel.h +++ b/intern/cycles/kernel/svm/fresnel.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Fresnel Node */ diff --git a/intern/cycles/kernel/svm/svm_gamma.h b/intern/cycles/kernel/svm/gamma.h index 7ec6c31065d..9f89e780be9 100644 --- a/intern/cycles/kernel/svm/svm_gamma.h +++ b/intern/cycles/kernel/svm/gamma.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_gamma(ccl_private ShaderData *sd, diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/geometry.h index b29bfdbed07..772942e0c08 100644 --- a/intern/cycles/kernel/svm/svm_geometry.h +++ b/intern/cycles/kernel/svm/geometry.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Geometry Node */ diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/gradient.h index 8cc37be606f..852196b73dc 100644 --- a/intern/cycles/kernel/svm/svm_gradient.h +++ b/intern/cycles/kernel/svm/gradient.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Gradient */ diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/hsv.h index 978c4c2d781..f6881fd4512 100644 --- a/intern/cycles/kernel/svm/svm_hsv.h +++ b/intern/cycles/kernel/svm/hsv.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef __SVM_HSV_H__ -#define __SVM_HSV_H__ +#pragma once CCL_NAMESPACE_BEGIN @@ -60,5 +59,3 @@ ccl_device_noinline void svm_node_hsv(KernelGlobals kg, } CCL_NAMESPACE_END - -#endif /* __SVM_HSV_H__ */ diff --git a/intern/cycles/kernel/svm/svm_ies.h b/intern/cycles/kernel/svm/ies.h index 0215670d062..f0923720878 100644 --- a/intern/cycles/kernel/svm/svm_ies.h +++ b/intern/cycles/kernel/svm/ies.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* IES Light */ diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/image.h index 68374fcfb0d..6ddf98a6ef1 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/image.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device float4 svm_image_texture(KernelGlobals kg, int id, float x, float y, uint flags) diff --git a/intern/cycles/kernel/svm/svm_invert.h b/intern/cycles/kernel/svm/invert.h index 60668ec00f1..5a88e9df2c9 100644 --- a/intern/cycles/kernel/svm/svm_invert.h +++ b/intern/cycles/kernel/svm/invert.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device float invert(float color, float factor) diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/light_path.h index 5e1fc4f671c..44a35b568fa 100644 --- a/intern/cycles/kernel/svm/svm_light_path.h +++ b/intern/cycles/kernel/svm/light_path.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Light Path Node */ diff --git a/intern/cycles/kernel/svm/svm_magic.h b/intern/cycles/kernel/svm/magic.h index d3a429fec56..f103a8eebcc 100644 --- a/intern/cycles/kernel/svm/svm_magic.h +++ b/intern/cycles/kernel/svm/magic.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Magic */ diff --git a/intern/cycles/kernel/svm/svm_map_range.h b/intern/cycles/kernel/svm/map_range.h index 5e89947c6c7..fdbfc6531c4 100644 --- a/intern/cycles/kernel/svm/svm_map_range.h +++ b/intern/cycles/kernel/svm/map_range.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Map Range Node */ diff --git a/intern/cycles/kernel/svm/svm_mapping.h b/intern/cycles/kernel/svm/mapping.h index ed420e5bc3d..19f79471ad2 100644 --- a/intern/cycles/kernel/svm/svm_mapping.h +++ b/intern/cycles/kernel/svm/mapping.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#pragma once + +#include "kernel/svm/mapping_util.h" + CCL_NAMESPACE_BEGIN /* Mapping Node */ diff --git a/intern/cycles/kernel/svm/svm_mapping_util.h b/intern/cycles/kernel/svm/mapping_util.h index ec2c84e0791..51b13c0c264 100644 --- a/intern/cycles/kernel/svm/svm_mapping_util.h +++ b/intern/cycles/kernel/svm/mapping_util.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device float3 diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/math.h index 97f7d486c09..ff0f3683ea3 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/math.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_math(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/math_util.h index d3225b55ef0..b2e539cdd1f 100644 --- a/intern/cycles/kernel/svm/svm_math_util.h +++ b/intern/cycles/kernel/svm/math_util.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device void svm_vector_math(ccl_private float *value, diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/mix.h index 568dda3dddc..96e5b3f5b5e 100644 --- a/intern/cycles/kernel/svm/svm_mix.h +++ b/intern/cycles/kernel/svm/mix.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Node */ diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/musgrave.h index decd29bbe13..4225c3d2d71 100644 --- a/intern/cycles/kernel/svm/svm_musgrave.h +++ b/intern/cycles/kernel/svm/musgrave.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#pragma once + +#include "kernel/svm/noise.h" + CCL_NAMESPACE_BEGIN /* 1D Musgrave fBm diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/noise.h index ecb4df6afdf..0a1616226db 100644 --- a/intern/cycles/kernel/svm/svm_noise.h +++ b/intern/cycles/kernel/svm/noise.h @@ -30,6 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma once + CCL_NAMESPACE_BEGIN /* **** Perlin Noise **** */ diff --git a/intern/cycles/kernel/svm/svm_noisetex.h b/intern/cycles/kernel/svm/noisetex.h index 3fe33f72b59..c43c3b9f9d2 100644 --- a/intern/cycles/kernel/svm/svm_noisetex.h +++ b/intern/cycles/kernel/svm/noisetex.h @@ -14,6 +14,10 @@ * limitations under the License. */ +#pragma once + +#include "kernel/svm/fractal_noise.h" + CCL_NAMESPACE_BEGIN /* The following offset functions generate random offsets to be added to texture diff --git a/intern/cycles/kernel/svm/svm_normal.h b/intern/cycles/kernel/svm/normal.h index 9bf64ed8823..6a2d88b68a6 100644 --- a/intern/cycles/kernel/svm/svm_normal.h +++ b/intern/cycles/kernel/svm/normal.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline int svm_node_normal(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/ramp.h index d2dddf4c6eb..1dc3383956d 100644 --- a/intern/cycles/kernel/svm/svm_ramp.h +++ b/intern/cycles/kernel/svm/ramp.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef __SVM_RAMP_H__ -#define __SVM_RAMP_H__ +#pragma once CCL_NAMESPACE_BEGIN @@ -164,5 +163,3 @@ ccl_device_noinline int svm_node_curve( } CCL_NAMESPACE_END - -#endif /* __SVM_RAMP_H__ */ diff --git a/intern/cycles/kernel/svm/svm_ramp_util.h b/intern/cycles/kernel/svm/ramp_util.h index 202596c1fe3..f5951f7e283 100644 --- a/intern/cycles/kernel/svm/svm_ramp_util.h +++ b/intern/cycles/kernel/svm/ramp_util.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef __SVM_RAMP_UTIL_H__ -#define __SVM_RAMP_UTIL_H__ +#pragma once CCL_NAMESPACE_BEGIN @@ -86,5 +85,3 @@ ccl_device float float_ramp_lookup( } CCL_NAMESPACE_END - -#endif /* __SVM_RAMP_UTIL_H__ */ diff --git a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h b/intern/cycles/kernel/svm/sepcomb_hsv.h index bafa0456342..941a83e85b3 100644 --- a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h +++ b/intern/cycles/kernel/svm/sepcomb_hsv.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline int svm_node_combine_hsv(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_sepcomb_vector.h b/intern/cycles/kernel/svm/sepcomb_vector.h index 11e440f2cbf..acdea741aed 100644 --- a/intern/cycles/kernel/svm/svm_sepcomb_vector.h +++ b/intern/cycles/kernel/svm/sepcomb_vector.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Vector combine / separate, used for the RGB and XYZ nodes */ diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/sky.h index 3ab7bc89c66..867fdfc2a3f 100644 --- a/intern/cycles/kernel/svm/svm_sky.h +++ b/intern/cycles/kernel/svm/sky.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Sky texture */ diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 472f3517839..62ba5bf04e3 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef __SVM_H__ -#define __SVM_H__ +#pragma once /* Shader Virtual Machine * @@ -38,7 +37,7 @@ * mostly taken care of in the SVM compiler. */ -#include "kernel/svm/svm_types.h" +#include "kernel/svm/types.h" CCL_NAMESPACE_BEGIN @@ -165,61 +164,54 @@ CCL_NAMESPACE_END /* Nodes */ -#include "kernel/svm/svm_noise.h" -#include "svm_fractal_noise.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_aov.h" -#include "kernel/svm/svm_attribute.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_convert.h" -#include "kernel/svm/svm_displace.h" -#include "kernel/svm/svm_fresnel.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_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_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_sky.h" -#include "kernel/svm/svm_tex_coord.h" -#include "kernel/svm/svm_value.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_wave.h" -#include "kernel/svm/svm_wavelength.h" -#include "kernel/svm/svm_white_noise.h" -#include "kernel/svm/svm_wireframe.h" +#include "kernel/svm/aov.h" +#include "kernel/svm/attribute.h" +#include "kernel/svm/blackbody.h" +#include "kernel/svm/brick.h" +#include "kernel/svm/brightness.h" +#include "kernel/svm/bump.h" +#include "kernel/svm/camera.h" +#include "kernel/svm/checker.h" +#include "kernel/svm/clamp.h" +#include "kernel/svm/closure.h" +#include "kernel/svm/convert.h" +#include "kernel/svm/displace.h" +#include "kernel/svm/fresnel.h" +#include "kernel/svm/gamma.h" +#include "kernel/svm/geometry.h" +#include "kernel/svm/gradient.h" +#include "kernel/svm/hsv.h" +#include "kernel/svm/ies.h" +#include "kernel/svm/image.h" +#include "kernel/svm/invert.h" +#include "kernel/svm/light_path.h" +#include "kernel/svm/magic.h" +#include "kernel/svm/map_range.h" +#include "kernel/svm/mapping.h" +#include "kernel/svm/math.h" +#include "kernel/svm/mix.h" +#include "kernel/svm/musgrave.h" +#include "kernel/svm/noisetex.h" +#include "kernel/svm/normal.h" +#include "kernel/svm/ramp.h" +#include "kernel/svm/sepcomb_hsv.h" +#include "kernel/svm/sepcomb_vector.h" +#include "kernel/svm/sky.h" +#include "kernel/svm/tex_coord.h" +#include "kernel/svm/value.h" +#include "kernel/svm/vector_rotate.h" +#include "kernel/svm/vector_transform.h" +#include "kernel/svm/vertex_color.h" +#include "kernel/svm/voronoi.h" +#include "kernel/svm/voxel.h" +#include "kernel/svm/wave.h" +#include "kernel/svm/wavelength.h" +#include "kernel/svm/white_noise.h" +#include "kernel/svm/wireframe.h" #ifdef __SHADER_RAYTRACE__ -# include "kernel/svm/svm_ao.h" -# include "kernel/svm/svm_bevel.h" +# include "kernel/svm/ao.h" +# include "kernel/svm/bevel.h" #endif CCL_NAMESPACE_BEGIN @@ -607,5 +599,3 @@ ccl_device void svm_eval_nodes(KernelGlobals kg, } CCL_NAMESPACE_END - -#endif /* __SVM_H__ */ diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/tex_coord.h index 9af0a818cad..5e0debc968a 100644 --- a/intern/cycles/kernel/svm/svm_tex_coord.h +++ b/intern/cycles/kernel/svm/tex_coord.h @@ -14,9 +14,11 @@ * limitations under the License. */ +#pragma once + #include "kernel/camera/camera.h" #include "kernel/geom/geom.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/types.h index 6f6c101fb69..8c95c571815 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/types.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef __SVM_TYPES_H__ -#define __SVM_TYPES_H__ +#pragma once CCL_NAMESPACE_BEGIN @@ -600,5 +599,3 @@ typedef enum ClosureType { #define CLOSURE_WEIGHT_CUTOFF 1e-5f CCL_NAMESPACE_END - -#endif /* __SVM_TYPES_H__ */ diff --git a/intern/cycles/kernel/svm/svm_value.h b/intern/cycles/kernel/svm/value.h index cc72961d0f6..cc62f1e2a82 100644 --- a/intern/cycles/kernel/svm/svm_value.h +++ b/intern/cycles/kernel/svm/value.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Value Nodes */ diff --git a/intern/cycles/kernel/svm/svm_vector_rotate.h b/intern/cycles/kernel/svm/vector_rotate.h index c20f9b2556f..2a0d331734c 100644 --- a/intern/cycles/kernel/svm/svm_vector_rotate.h +++ b/intern/cycles/kernel/svm/vector_rotate.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Vector Rotate */ diff --git a/intern/cycles/kernel/svm/svm_vector_transform.h b/intern/cycles/kernel/svm/vector_transform.h index 4e0d36647da..d7a51078cea 100644 --- a/intern/cycles/kernel/svm/svm_vector_transform.h +++ b/intern/cycles/kernel/svm/vector_transform.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Vector Transform */ diff --git a/intern/cycles/kernel/svm/svm_vertex_color.h b/intern/cycles/kernel/svm/vertex_color.h index a5fa15ee085..b676a28c0e3 100644 --- a/intern/cycles/kernel/svm/svm_vertex_color.h +++ b/intern/cycles/kernel/svm/vertex_color.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_vertex_color(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/voronoi.h index b8067520770..730965b6aed 100644 --- a/intern/cycles/kernel/svm/svm_voronoi.h +++ b/intern/cycles/kernel/svm/voronoi.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/voxel.h index be4bb315145..43947fbc54f 100644 --- a/intern/cycles/kernel/svm/svm_voxel.h +++ b/intern/cycles/kernel/svm/voxel.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* TODO(sergey): Think of making it more generic volume-type attribute diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/wave.h index d04b7aa3476..40e71b9d5df 100644 --- a/intern/cycles/kernel/svm/svm_wave.h +++ b/intern/cycles/kernel/svm/wave.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Wave */ diff --git a/intern/cycles/kernel/svm/svm_wavelength.h b/intern/cycles/kernel/svm/wavelength.h index 4ef041f68d5..28fd172abc7 100644 --- a/intern/cycles/kernel/svm/svm_wavelength.h +++ b/intern/cycles/kernel/svm/wavelength.h @@ -30,6 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Wavelength to RGB */ diff --git a/intern/cycles/kernel/svm/svm_white_noise.h b/intern/cycles/kernel/svm/white_noise.h index 6c2c3d6a683..d275a3f7068 100644 --- a/intern/cycles/kernel/svm/svm_white_noise.h +++ b/intern/cycles/kernel/svm/white_noise.h @@ -14,6 +14,8 @@ * limitations under the License. */ +#pragma once + CCL_NAMESPACE_BEGIN ccl_device_noinline void svm_node_tex_white_noise(KernelGlobals kg, diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/wireframe.h index d75976d23e1..530a9601bce 100644 --- a/intern/cycles/kernel/svm/svm_wireframe.h +++ b/intern/cycles/kernel/svm/wireframe.h @@ -30,6 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma once + CCL_NAMESPACE_BEGIN /* Wireframe Node */ diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/textures.h index 464ecb183cb..464ecb183cb 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/textures.h diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/types.h index 4312c1b67d2..4109dd6a486 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/types.h @@ -22,15 +22,15 @@ # define __EMBREE__ #endif -#include "util/util_math.h" -#include "util/util_math_fast.h" -#include "util/util_math_intersect.h" -#include "util/util_projection.h" -#include "util/util_texture.h" -#include "util/util_transform.h" -#include "util/util_static_assert.h" - -#include "kernel/svm/svm_types.h" +#include "util/math.h" +#include "util/math_fast.h" +#include "util/math_intersect.h" +#include "util/projection.h" +#include "util/static_assert.h" +#include "util/texture.h" +#include "util/transform.h" + +#include "kernel/svm/types.h" #ifndef __KERNEL_GPU__ # define __KERNEL_CPU__ diff --git a/intern/cycles/kernel/util/util_color.h b/intern/cycles/kernel/util/color.h index 0d7bfecd5f3..6d17647c9f8 100644 --- a/intern/cycles/kernel/util/util_color.h +++ b/intern/cycles/kernel/util/color.h @@ -16,7 +16,7 @@ #pragma once -#include "util/util_color.h" +#include "util/color.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/util/util_differential.h b/intern/cycles/kernel/util/differential.h index 17187083019..17187083019 100644 --- a/intern/cycles/kernel/util/util_differential.h +++ b/intern/cycles/kernel/util/differential.h diff --git a/intern/cycles/kernel/util/util_lookup_table.h b/intern/cycles/kernel/util/lookup_table.h index 2c26e668d7b..2c26e668d7b 100644 --- a/intern/cycles/kernel/util/util_lookup_table.h +++ b/intern/cycles/kernel/util/lookup_table.h diff --git a/intern/cycles/kernel/util/util_profiling.h b/intern/cycles/kernel/util/profiling.h index db8644005ea..12ce441ccbf 100644 --- a/intern/cycles/kernel/util/util_profiling.h +++ b/intern/cycles/kernel/util/profiling.h @@ -17,7 +17,7 @@ #pragma once #ifdef __KERNEL_CPU__ -# include "util/util_profiling.h" +# include "util/profiling.h" #endif CCL_NAMESPACE_BEGIN |