archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Make all #include statements relative to cycles source directory

Browse Source 
The idea is to make include statements more explicit and obvious where the
file is coming from, additionally reducing chance of wrong header being
picked up.

For example, it was not obvious whether bvh.h was refferring to builder
or traversal, whenter node.h is a generic graph node or a shader node
and cases like that.

Surely this might look obvious for the active developers, but after some
time of not touching the code it becomes less obvious where file is coming
from.

This was briefly mentioned in T50824 and seems @brecht is fine with such
explicitness, but need to agree with all active developers before committing
this.

Please note that this patch is lacking changes related on GPU/OpenCL
support. This will be solved if/when we all agree this is a good idea to move
forward.

Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner

Reviewed By: lukasstockner97, maiself, nirved, dingto

Subscribers: brecht

Differential Revision: https://developer.blender.org/D2586
This commit is contained in:
Sergey Sharybin
2017-03-28 20:39:14 +02:00
parent 61db9ee27a
commit 0579eaae1f
233 changed files with 1421 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/CMakeLists.txt
View File

@@ -1,12 +1,6 @@
set(INC set(INC
../graph ..
../render
../device
../kernel
../kernel/svm
../util
../subd
../../glew-mx ../../glew-mx
../../guardedalloc ../../guardedalloc
../../mikktspace ../../mikktspace

10
intern/cycles/blender/blender_camera.cpp
View File

@@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include "camera.h" #include "render/camera.h"
#include "scene.h" #include "render/scene.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_logging.h" #include "util/util_logging.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

20
intern/cycles/blender/blender_curves.cpp
View File

@@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
#include "attribute.h" #include "render/attribute.h"
#include "camera.h" #include "render/camera.h"
#include "curves.h" #include "render/curves.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/blender/blender_logging.cpp
View File

@@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "CCL_api.h" #include "blender/CCL_api.h"
#include "util_logging.h" #include "util/util_logging.h"
void CCL_init_logging(const char *argv0) void CCL_init_logging(const char *argv0)
{ {

26
intern/cycles/blender/blender_mesh.cpp
View File

@@ -15,22 +15,22 @@
*/ */
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "camera.h" #include "render/camera.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_session.h" #include "blender/blender_session.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "subd_patch.h" #include "subd/subd_patch.h"
#include "subd_split.h" #include "subd/subd_split.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_math.h" #include "util/util_math.h"
#include "mikktspace.h" #include "mikktspace.h"

32
intern/cycles/blender/blender_object.cpp
View File

@@ -14,24 +14,24 @@
* limitations under the License. * limitations under the License.
*/ */
#include "camera.h" #include "render/camera.h"
#include "integrator.h" #include "render/integrator.h"
#include "graph.h" #include "render/graph.h"
#include "light.h" #include "render/light.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "nodes.h" #include "render/nodes.h"
#include "particles.h" #include "render/particles.h"
#include "shader.h" #include "render/shader.h"
#include "blender_object_cull.h" #include "blender/blender_object_cull.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_hash.h" #include "util/util_hash.h"
#include "util_logging.h" #include "util/util_logging.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/blender/blender_object_cull.cpp
View File

@@ -16,9 +16,9 @@
#include <cstdlib> #include <cstdlib>
#include "camera.h" #include "render/camera.h"
#include "blender_object_cull.h" #include "blender/blender_object_cull.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/blender/blender_object_cull.h
View File

@@ -17,8 +17,8 @@
#ifndef __BLENDER_OBJECT_CULL_H__ #ifndef __BLENDER_OBJECT_CULL_H__
#define __BLENDER_OBJECT_CULL_H__ #define __BLENDER_OBJECT_CULL_H__
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "util_types.h" #include "util/util_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

12
intern/cycles/blender/blender_particles.cpp
View File

@@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "particles.h" #include "render/particles.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_foreach.h" #include "util/util_foreach.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

22
intern/cycles/blender/blender_python.cpp
View File

@@ -16,21 +16,21 @@
#include <Python.h> #include <Python.h>
#include "CCL_api.h" #include "blender/CCL_api.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_session.h" #include "blender/blender_session.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_opengl.h" #include "util/util_opengl.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_types.h" #include "util/util_types.h"
#ifdef WITH_OSL #ifdef WITH_OSL
#include "osl.h" #include "render/osl.h"
#include <OSL/oslquery.h> #include <OSL/oslquery.h>
#include <OSL/oslconfig.h> #include <OSL/oslconfig.h>

44
intern/cycles/blender/blender_session.cpp
View File

@@ -16,30 +16,30 @@
#include <stdlib.h> #include <stdlib.h>
#include "background.h" #include "render/background.h"
#include "buffers.h" #include "render/buffers.h"
#include "camera.h" #include "render/camera.h"
#include "device.h" #include "device/device.h"
#include "integrator.h" #include "render/integrator.h"
#include "film.h" #include "render/film.h"
#include "light.h" #include "render/light.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "session.h" #include "render/session.h"
#include "shader.h" #include "render/shader.h"
#include "util_color.h" #include "util/util_color.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_function.h" #include "util/util_function.h"
#include "util_hash.h" #include "util/util_hash.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_progress.h" #include "util/util_progress.h"
#include "util_time.h" #include "util/util_time.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_session.h" #include "blender/blender_session.h"
#include "blender_util.h" #include "blender/blender_util.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/blender/blender_session.h
View File

@@ -17,12 +17,12 @@
#ifndef __BLENDER_SESSION_H__ #ifndef __BLENDER_SESSION_H__
#define __BLENDER_SESSION_H__ #define __BLENDER_SESSION_H__
#include "device.h" #include "device/device.h"
#include "scene.h" #include "render/scene.h"
#include "session.h" #include "render/session.h"
#include "bake.h" #include "render/bake.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

26
intern/cycles/blender/blender_shader.cpp
View File

@@ -14,21 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
#include "background.h" #include "render/background.h"
#include "graph.h" #include "render/graph.h"
#include "light.h" #include "render/light.h"
#include "nodes.h" #include "render/nodes.h"
#include "osl.h" #include "render/osl.h"
#include "scene.h" #include "render/scene.h"
#include "shader.h" #include "render/shader.h"
#include "blender_texture.h" #include "blender/blender_texture.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_task.h" #include "util/util_task.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

40
intern/cycles/blender/blender_sync.cpp
View File

@@ -14,29 +14,29 @@
* limitations under the License. * limitations under the License.
*/ */
#include "background.h" #include "render/background.h"
#include "camera.h" #include "render/camera.h"
#include "film.h" #include "render/film.h"
#include "graph.h" #include "render/graph.h"
#include "integrator.h" #include "render/integrator.h"
#include "light.h" #include "render/light.h"
#include "mesh.h" #include "render/mesh.h"
#include "nodes.h" #include "render/nodes.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "shader.h" #include "render/shader.h"
#include "curves.h" #include "render/curves.h"
#include "device.h" #include "device/device.h"
#include "blender_sync.h" #include "blender/blender_sync.h"
#include "blender_session.h" #include "blender/blender_session.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_opengl.h" #include "util/util_opengl.h"
#include "util_hash.h" #include "util/util_hash.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

14
intern/cycles/blender/blender_sync.h
View File

@@ -22,15 +22,15 @@
#include "RNA_access.h" #include "RNA_access.h"
#include "RNA_blender_cpp.h" #include "RNA_blender_cpp.h"
#include "blender_util.h" #include "blender/blender_util.h"
#include "scene.h" #include "render/scene.h"
#include "session.h" #include "render/session.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_set.h" #include "util/util_set.h"
#include "util_transform.h" #include "util/util_transform.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

2
intern/cycles/blender/blender_texture.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "blender_texture.h" #include "blender/blender_texture.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

2
intern/cycles/blender/blender_texture.h
View File

@@ -18,7 +18,7 @@
#define __BLENDER_TEXTURE_H__ #define __BLENDER_TEXTURE_H__
#include <stdlib.h> #include <stdlib.h>
#include "blender_sync.h" #include "blender/blender_sync.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

16
intern/cycles/blender/blender_util.h
View File

@@ -17,15 +17,15 @@
#ifndef __BLENDER_UTIL_H__ #ifndef __BLENDER_UTIL_H__
#define __BLENDER_UTIL_H__ #define __BLENDER_UTIL_H__
#include "mesh.h" #include "render/mesh.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_set.h" #include "util/util_set.h"
#include "util_transform.h" #include "util/util_transform.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_vector.h" #include "util/util_vector.h"
/* Hacks to hook into Blender API /* Hacks to hook into Blender API
* todo: clean this up ... */ * todo: clean this up ... */

8
intern/cycles/bvh/CMakeLists.txt
View File

@@ -1,12 +1,6 @@
set(INC set(INC
. ..
../graph
../kernel
../kernel/svm
../render
../util
../device
) )
set(INC_SYS set(INC_SYS

34
intern/cycles/bvh/bvh.cpp
View File

@@ -15,25 +15,25 @@
* limitations under the License. * limitations under the License.
*/ */
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "curves.h" #include "render/curves.h"
#include "bvh.h" #include "bvh/bvh.h"
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_node.h" #include "bvh/bvh_node.h"
#include "bvh_params.h" #include "bvh/bvh_params.h"
#include "bvh_unaligned.h" #include "bvh/bvh_unaligned.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_progress.h" #include "util/util_progress.h"
#include "util_system.h" #include "util/util_system.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_math.h" #include "util/util_math.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/bvh/bvh.h
View File

@@ -18,10 +18,10 @@
#ifndef __BVH_H__ #ifndef __BVH_H__
#define __BVH_H__ #define __BVH_H__
#include "bvh_params.h" #include "bvh/bvh_params.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/bvh/bvh_binning.cpp
View File

@@ -19,11 +19,11 @@
#include <stdlib.h> #include <stdlib.h>
#include "bvh_binning.h" #include "bvh/bvh_binning.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_boundbox.h" #include "util/util_boundbox.h"
#include "util_types.h" #include "util/util_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/bvh/bvh_binning.h
View File

@@ -18,10 +18,10 @@
#ifndef __BVH_BINNING_H__ #ifndef __BVH_BINNING_H__
#define __BVH_BINNING_H__ #define __BVH_BINNING_H__
#include "bvh_params.h" #include "bvh/bvh_params.h"
#include "bvh_unaligned.h" #include "bvh/bvh_unaligned.h"
#include "util_types.h" #include "util/util_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

34
intern/cycles/bvh/bvh_build.cpp
View File

@@ -15,26 +15,26 @@
* limitations under the License. * limitations under the License.
*/ */
#include "bvh_binning.h" #include "bvh/bvh_binning.h"
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_node.h" #include "bvh/bvh_node.h"
#include "bvh_params.h" #include "bvh/bvh_params.h"
#include "bvh_split.h" #include "bvh_split.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "scene.h" #include "render/scene.h"
#include "curves.h" #include "render/curves.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_progress.h" #include "util/util_progress.h"
#include "util_stack_allocator.h" #include "util/util_stack_allocator.h"
#include "util_simd.h" #include "util/util_simd.h"
#include "util_time.h" #include "util/util_time.h"
#include "util_queue.h" #include "util/util_queue.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

12
intern/cycles/bvh/bvh_build.h
View File

@@ -20,13 +20,13 @@
#include <float.h> #include <float.h>
#include "bvh.h" #include "bvh/bvh.h"
#include "bvh_binning.h" #include "bvh/bvh_binning.h"
#include "bvh_unaligned.h" #include "bvh/bvh_unaligned.h"
#include "util_boundbox.h" #include "util/util_boundbox.h"
#include "util_task.h" #include "util/util_task.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/bvh/bvh_node.cpp
View File

@@ -15,12 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "bvh.h" #include "bvh/bvh.h"
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_node.h" #include "bvh/bvh_node.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/bvh/bvh_node.h
View File

@@ -18,9 +18,9 @@
#ifndef __BVH_NODE_H__ #ifndef __BVH_NODE_H__
#define __BVH_NODE_H__ #define __BVH_NODE_H__
#include "util_boundbox.h" #include "util/util_boundbox.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_types.h" #include "util/util_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/bvh/bvh_params.h
View File

@@ -18,9 +18,9 @@
#ifndef __BVH_PARAMS_H__ #ifndef __BVH_PARAMS_H__
#define __BVH_PARAMS_H__ #define __BVH_PARAMS_H__
#include "util_boundbox.h" #include "util/util_boundbox.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/bvh/bvh_sort.cpp
View File

@@ -15,12 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_sort.h" #include "bvh/bvh_sort.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_task.h" #include "util/util_task.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

12
intern/cycles/bvh/bvh_split.cpp
View File

@@ -15,14 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_split.h" #include "bvh/bvh_split.h"
#include "bvh_sort.h" #include "bvh/bvh_sort.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/bvh/bvh_split.h
View File

@@ -18,8 +18,8 @@
#ifndef __BVH_SPLIT_H__ #ifndef __BVH_SPLIT_H__
#define __BVH_SPLIT_H__ #define __BVH_SPLIT_H__
#include "bvh_build.h" #include "bvh/bvh_build.h"
#include "bvh_params.h" #include "bvh/bvh_params.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

14
intern/cycles/bvh/bvh_unaligned.cpp
View File

@@ -15,17 +15,17 @@
*/ */
#include "bvh_unaligned.h" #include "bvh/bvh_unaligned.h"
#include "mesh.h" #include "render/mesh.h"
#include "object.h" #include "render/object.h"
#include "bvh_binning.h" #include "bvh/bvh_binning.h"
#include "bvh_params.h" #include "bvh_params.h"
#include "util_boundbox.h" #include "util/util_boundbox.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_transform.h" #include "util/util_transform.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

2
intern/cycles/bvh/bvh_unaligned.h
View File

@@ -17,7 +17,7 @@
#ifndef __BVH_UNALIGNED_H__ #ifndef __BVH_UNALIGNED_H__
#define __BVH_UNALIGNED_H__ #define __BVH_UNALIGNED_H__
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

9
intern/cycles/device/CMakeLists.txt
View File

@@ -1,13 +1,6 @@
set(INC set(INC
. ..
../graph
../kernel
../kernel/split
../kernel/svm
../kernel/osl
../util
../render
../../glew-mx ../../glew-mx
) )

22
intern/cycles/device/device.cpp
View File

@@ -17,18 +17,18 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "device.h" #include "device/device.h"
#include "device_intern.h" #include "device/device_intern.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_half.h" #include "util/util_half.h"
#include "util_math.h" #include "util/util_math.h"
#include "util_opengl.h" #include "util/util_opengl.h"
#include "util_time.h" #include "util/util_time.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_vector.h" #include "util/util_vector.h"
#include "util_string.h" #include "util/util_string.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

16
intern/cycles/device/device.h
View File

@@ -19,15 +19,15 @@
#include <stdlib.h> #include <stdlib.h>
#include "device_memory.h" #include "device/device_memory.h"
#include "device_task.h" #include "device/device_task.h"
#include "util_list.h" #include "util/util_list.h"
#include "util_stats.h" #include "util/util_stats.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_thread.h" #include "util/util_thread.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

42
intern/cycles/device/device_cpu.cpp
View File

@@ -20,34 +20,34 @@
/* So ImathMath is included before our kernel_cpu_compat. */ /* So ImathMath is included before our kernel_cpu_compat. */
#ifdef WITH_OSL #ifdef WITH_OSL
/* So no context pollution happens from indirectly included windows.h */ /* So no context pollution happens from indirectly included windows.h */
# include "util_windows.h" # include "util/util_windows.h"
# include <OSL/oslexec.h> # include <OSL/oslexec.h>
#endif #endif
#include "device.h" #include "device/device.h"
#include "device_intern.h" #include "device/device_intern.h"
#include "device_split_kernel.h" #include "device/device_split_kernel.h"
#include "kernel.h" #include "kernel/kernel.h"
#include "kernel_compat_cpu.h" #include "kernel/kernel_compat_cpu.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
#include "split/kernel_split_data.h" #include "kernel/split/kernel_split_data.h"
#include "kernel_globals.h" #include "kernel/kernel_globals.h"
#include "osl_shader.h" #include "kernel/osl/osl_shader.h"
#include "osl_globals.h" #include "kernel/osl/osl_globals.h"
#include "buffers.h" #include "render/buffers.h"
#include "util_debug.h" #include "util/util_debug.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_function.h" #include "util/util_function.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_opengl.h" #include "util/util_opengl.h"
#include "util_progress.h" #include "util/util_progress.h"
#include "util_system.h" #include "util/util_system.h"
#include "util_thread.h" #include "util/util_thread.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

38
intern/cycles/device/device_cuda.cpp
View File

@@ -20,31 +20,31 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "device.h" #include "device/device.h"
#include "device_intern.h" #include "device/device_intern.h"
#include "device_split_kernel.h" #include "device/device_split_kernel.h"
#include "buffers.h" #include "render/buffers.h"
#ifdef WITH_CUDA_DYNLOAD #ifdef WITH_CUDA_DYNLOAD
# include "cuew.h" # include "cuew.h"
#else #else
# include "util_opengl.h" # include "util/util_opengl.h"
# include <cuda.h> # include <cuda.h>
# include <cudaGL.h> # include <cudaGL.h>
#endif #endif
#include "util_debug.h" #include "util/util_debug.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_opengl.h" #include "util/util_opengl.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_system.h" #include "util/util_system.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_time.h" #include "util/util_time.h"
#include "split/kernel_split_data_types.h" #include "kernel/split/kernel_split_data_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -300,8 +300,8 @@ public:
{ {
const int cuda_version = cuewCompilerVersion(); const int cuda_version = cuewCompilerVersion();
const int machine = system_cpu_bits(); const int machine = system_cpu_bits();
const string kernel_path = path_get("kernel"); const string kernel_path = path_get("source/kernel");
const string include = kernel_path; const string include = path_dirname(kernel_path);
string cflags = string_printf("-m%d " string cflags = string_printf("-m%d "
"--ptxas-options=\"-v\" " "--ptxas-options=\"-v\" "
"--use_fast_math " "--use_fast_math "
@@ -382,7 +382,7 @@ public:
compile_kernel_get_common_cflags(requested_features, split); compile_kernel_get_common_cflags(requested_features, split);
/* Try to use locally compiled kernel. */ /* Try to use locally compiled kernel. */
const string kernel_path = path_get("kernel"); const string kernel_path = path_get("source/kernel");
const string kernel_md5 = path_files_md5_hash(kernel_path); const string kernel_md5 = path_files_md5_hash(kernel_path);
/* We include cflags into md5 so changing cuda toolkit or changing other /* We include cflags into md5 so changing cuda toolkit or changing other

8
intern/cycles/device/device_memory.h
View File

@@ -28,10 +28,10 @@
* other devices this is a pointer to device memory, where we will copy memory * other devices this is a pointer to device memory, where we will copy memory
* to and from. */ * to and from. */
#include "util_debug.h" #include "util/util_debug.h"
#include "util_half.h" #include "util/util_half.h"
#include "util_types.h" #include "util/util_types.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

18
intern/cycles/device/device_multi.cpp
View File

@@ -17,17 +17,17 @@
#include <stdlib.h> #include <stdlib.h>
#include <sstream> #include <sstream>
#include "device.h" #include "device/device.h"
#include "device_intern.h" #include "device/device_intern.h"
#include "device_network.h" #include "device/device_network.h"
#include "buffers.h" #include "render/buffers.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_list.h" #include "util/util_list.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/device/device_network.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "device.h" #include "device/device.h"
#include "device_intern.h" #include "device/device_intern.h"
#include "device_network.h" #include "device/device_network.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#if defined(WITH_NETWORK) #if defined(WITH_NETWORK)

10
intern/cycles/device/device_network.h
View File

@@ -33,12 +33,12 @@
#include <sstream> #include <sstream>
#include <deque> #include <deque>
#include "buffers.h" #include "render/buffers.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_list.h" #include "util/util_list.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_string.h" #include "util/util_string.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/device/device_opencl.cpp
View File

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

8
intern/cycles/device/device_split_kernel.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "device_split_kernel.h" #include "device/device_split_kernel.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
#include "kernel_split_data_types.h" #include "kernel/split/kernel_split_data_types.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/device/device_split_kernel.h
View File

@@ -17,8 +17,8 @@
#ifndef __DEVICE_SPLIT_KERNEL_H__ #ifndef __DEVICE_SPLIT_KERNEL_H__
#define __DEVICE_SPLIT_KERNEL_H__ #define __DEVICE_SPLIT_KERNEL_H__
#include "device.h" #include "device/device.h"
#include "buffers.h" #include "render/buffers.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/device/device_task.cpp
View File

@@ -17,12 +17,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "device_task.h" #include "device/device_task.h"
#include "buffers.h" #include "render/buffers.h"
#include "util_algorithm.h" #include "util/util_algorithm.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/device/device_task.h
View File

@@ -17,11 +17,11 @@
#ifndef __DEVICE_TASK_H__ #ifndef __DEVICE_TASK_H__
#define __DEVICE_TASK_H__ #define __DEVICE_TASK_H__
#include "device_memory.h" #include "device/device_memory.h"
#include "util_function.h" #include "util/util_function.h"
#include "util_list.h" #include "util/util_list.h"
#include "util_task.h" #include "util/util_task.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/device/opencl/opencl.h
View File

@@ -16,11 +16,11 @@
#ifdef WITH_OPENCL #ifdef WITH_OPENCL
#include "device.h" #include "device/device.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_param.h" #include "util/util_param.h"
#include "util_string.h" #include "util/util_string.h"
#include "clew.h" #include "clew.h"

18
intern/cycles/device/opencl/opencl_base.cpp
View File

@@ -16,15 +16,15 @@
#ifdef WITH_OPENCL #ifdef WITH_OPENCL
#include "opencl.h" #include "device/opencl/opencl.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -527,7 +527,7 @@ void OpenCLDeviceBase::film_convert(DeviceTask& task, device_ptr buffer, device_
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
set_kernel_arg_mem(ckFilmConvertKernel, &start_arg_index, #name); set_kernel_arg_mem(ckFilmConvertKernel, &start_arg_index, #name);
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
#undef KERNEL_TEX #undef KERNEL_TEX
start_arg_index += kernel_set_args(ckFilmConvertKernel, start_arg_index += kernel_set_args(ckFilmConvertKernel,
@@ -578,7 +578,7 @@ void OpenCLDeviceBase::shader(DeviceTask& task)
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
set_kernel_arg_mem(kernel, &start_arg_index, #name); set_kernel_arg_mem(kernel, &start_arg_index, #name);
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
#undef KERNEL_TEX #undef KERNEL_TEX
start_arg_index += kernel_set_args(kernel, start_arg_index += kernel_set_args(kernel,

14
intern/cycles/device/opencl/opencl_mega.cpp
View File

@@ -16,15 +16,15 @@
#ifdef WITH_OPENCL #ifdef WITH_OPENCL
#include "opencl.h" #include "device/opencl/opencl.h"
#include "buffers.h" #include "render/buffers.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -84,7 +84,7 @@ public:
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
set_kernel_arg_mem(ckPathTraceKernel, &start_arg_index, #name); set_kernel_arg_mem(ckPathTraceKernel, &start_arg_index, #name);
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
#undef KERNEL_TEX #undef KERNEL_TEX
start_arg_index += kernel_set_args(ckPathTraceKernel, start_arg_index += kernel_set_args(ckPathTraceKernel,

22
intern/cycles/device/opencl/opencl_split.cpp
View File

@@ -16,19 +16,19 @@
#ifdef WITH_OPENCL #ifdef WITH_OPENCL
#include "opencl.h" #include "device/opencl/opencl.h"
#include "buffers.h" #include "render/buffers.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
#include "kernel_split_data_types.h" #include "kernel/split/kernel_split_data_types.h"
#include "device_split_kernel.h" #include "device/device_split_kernel.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_time.h" #include "util/util_time.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -110,7 +110,7 @@ public:
ccl_constant KernelData *data; ccl_constant KernelData *data;
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name; ccl_global type *name;
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
#undef KERNEL_TEX #undef KERNEL_TEX
SplitData split_data; SplitData split_data;
SplitParams split_param_data; SplitParams split_param_data;
@@ -291,7 +291,7 @@ public:
/* TODO(sergey): Avoid map lookup here. */ /* TODO(sergey): Avoid map lookup here. */
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
device->set_kernel_arg_mem(device->program_data_init(), &start_arg_index, #name); device->set_kernel_arg_mem(device->program_data_init(), &start_arg_index, #name);
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
#undef KERNEL_TEX #undef KERNEL_TEX
start_arg_index += start_arg_index +=

18
intern/cycles/device/opencl/opencl_util.cpp
View File

@@ -16,12 +16,12 @@
#ifdef WITH_OPENCL #ifdef WITH_OPENCL
#include "opencl.h" #include "device/opencl/opencl.h"
#include "util_logging.h" #include "util/util_logging.h"
#include "util_md5.h" #include "util/util_md5.h"
#include "util_path.h" #include "util/util_path.h"
#include "util_time.h" #include "util/util_time.h"
using std::cerr; using std::cerr;
using std::endl; using std::endl;
@@ -235,7 +235,7 @@ string OpenCLCache::get_kernel_md5()
thread_scoped_lock lock(self.kernel_md5_lock); thread_scoped_lock lock(self.kernel_md5_lock);
if(self.kernel_md5.empty()) { if(self.kernel_md5.empty()) {
self.kernel_md5 = path_files_md5_hash(path_get("kernel")); self.kernel_md5 = path_files_md5_hash(path_get("source/kernel"));
} }
return self.kernel_md5; return self.kernel_md5;
} }
@@ -339,12 +339,12 @@ bool OpenCLDeviceBase::OpenCLProgram::build_kernel(const string *debug_src)
bool OpenCLDeviceBase::OpenCLProgram::compile_kernel(const string *debug_src) bool OpenCLDeviceBase::OpenCLProgram::compile_kernel(const string *debug_src)
{ {
string source = "#include \"kernels/opencl/" + kernel_file + "\"\n"; string source = "#include \"kernel/kernels/opencl/" + kernel_file + "\"\n";
/* We compile kernels consisting of many files. unfortunately OpenCL /* We compile kernels consisting of many files. unfortunately OpenCL
* kernel caches do not seem to recognize changes in included files. * kernel caches do not seem to recognize changes in included files.
* so we force recompile on changes by adding the md5 hash of all files. * so we force recompile on changes by adding the md5 hash of all files.
*/ */
source = path_source_replace_includes(source, path_get("kernel")); source = path_source_replace_includes(source, path_get("source"));
source += "\n// " + util_md5_string(source) + "\n"; source += "\n// " + util_md5_string(source) + "\n";
if(debug_src) { if(debug_src) {
@@ -444,7 +444,7 @@ void OpenCLDeviceBase::OpenCLProgram::load()
/* need to create source to get md5 */ /* need to create source to get md5 */
string source = "#include \"kernels/opencl/" + kernel_file + "\"\n"; string source = "#include \"kernels/opencl/" + kernel_file + "\"\n";
source = path_source_replace_includes(source, path_get("kernel")); source = path_source_replace_includes(source, path_get("source/kernel"));
string basename = "cycles_kernel_" + program_name + "_" + device_md5 + "_" + util_md5_string(source); string basename = "cycles_kernel_" + program_name + "_" + device_md5 + "_" + util_md5_string(source);
basename = path_cache_get(path_join("kernels", basename)); basename = path_cache_get(path_join("kernels", basename));

3
intern/cycles/graph/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
set(INC set(INC
. ..
../util
) )
set(SRC set(SRC

10
intern/cycles/graph/node.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "node.h" #include "graph/node.h"
#include "node_type.h" #include "graph/node_type.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_param.h" #include "util/util_param.h"
#include "util_transform.h" #include "util/util_transform.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/graph/node.h
View File

@@ -16,11 +16,11 @@
#pragma once #pragma once
#include "node_type.h" #include "graph/node_type.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_param.h" #include "util/util_param.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/graph/node_enum.h
View File

@@ -16,8 +16,8 @@
#pragma once #pragma once
#include "util_map.h" #include "util/util_map.h"
#include "util_param.h" #include "util/util_param.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/graph/node_type.cpp
View File

@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "node_type.h" #include "graph/node_type.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_transform.h" #include "util/util_transform.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/graph/node_type.h
View File

@@ -16,12 +16,12 @@
#pragma once #pragma once
#include "node_enum.h" #include "graph/node_enum.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_param.h" #include "util/util_param.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_vector.h" #include "util/util_vector.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/graph/node_xml.cpp
View File

@@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#include "node_xml.h" #include "graph/node_xml.h"
#include "util_foreach.h" #include "util/util_foreach.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_transform.h" #include "util/util_transform.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

8
intern/cycles/graph/node_xml.h
View File

@@ -16,11 +16,11 @@
#pragma once #pragma once
#include "node.h" #include "graph/node.h"
#include "util_map.h" #include "util/util_map.h"
#include "util_string.h" #include "util/util_string.h"
#include "util_xml.h" #include "util/util_xml.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

66
intern/cycles/kernel/CMakeLists.txt
View File

@@ -1,10 +1,7 @@
remove_extra_strict_flags() remove_extra_strict_flags()
set(INC set(INC
. ..
../util
osl
svm
) )
set(INC_SYS set(INC_SYS
@@ -309,8 +306,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
${cuda_math_flags} ${cuda_math_flags}
${cuda_extra_flags} ${cuda_extra_flags}
${cuda_debug_flags} ${cuda_debug_flags}
-I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/..
-I${CMAKE_CURRENT_SOURCE_DIR}/svm
-DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_BEGIN=
-DCCL_NAMESPACE_END= -DCCL_NAMESPACE_END=
-DNVCC -DNVCC
@@ -413,33 +409,33 @@ endif()
#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED}) #add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED})
#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel) #delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_state_buffer_size.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_state_buffer_size.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_split.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_split.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_data_init.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_data_init.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_path_init.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_path_init.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_queue_enqueue.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_queue_enqueue.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_scene_intersect.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_scene_intersect.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_lamp_emission.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_lamp_emission.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_do_volume.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_do_volume.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_indirect_background.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_indirect_background.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shader_eval.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shader_eval.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_subsurface_scatter.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_subsurface_scatter.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_direct_lighting.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_direct_lighting.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shadow_blocked_ao.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shadow_blocked_ao.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shadow_blocked_dl.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_shadow_blocked_dl.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_next_iteration_setup.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_next_iteration_setup.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_indirect_subsurface.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_indirect_subsurface.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_buffer_update.cl" ${CYCLES_INSTALL_PATH}/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/opencl/kernel_buffer_update.cl" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/cuda/kernel.cu" ${CYCLES_INSTALL_PATH}/kernel/kernels/cuda) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/cuda/kernel.cu" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/cuda)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/cuda/kernel_split.cu" ${CYCLES_INSTALL_PATH}/kernel/kernels/cuda) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernels/cuda/kernel_split.cu" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/cuda)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_KERNELS_CUDA_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/kernels/cuda) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_KERNELS_CUDA_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/cuda)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_BVH_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/bvh) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_BVH_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/bvh)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CLOSURE_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/closure) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CLOSURE_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/closure)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/svm) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/svm)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_GEOM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/geom) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_GEOM_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/geom)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/source/util)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SPLIT_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/split) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SPLIT_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/split)

42
intern/cycles/kernel/bvh/bvh.h
View File

@@ -27,43 +27,43 @@
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
#include "bvh_types.h" #include "kernel/bvh/bvh_types.h"
/* Common QBVH functions. */ /* Common QBVH functions. */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_nodes.h" # include "kernel/bvh/qbvh_nodes.h"
#endif #endif
/* Regular BVH traversal */ /* Regular BVH traversal */
#include "bvh_nodes.h" #include "kernel/bvh/bvh_nodes.h"
#define BVH_FUNCTION_NAME bvh_intersect #define BVH_FUNCTION_NAME bvh_intersect
#define BVH_FUNCTION_FEATURES 0 #define BVH_FUNCTION_FEATURES 0
#include "bvh_traversal.h" #include "kernel/bvh/bvh_traversal.h"
#if defined(__INSTANCING__) #if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_instancing # define BVH_FUNCTION_NAME bvh_intersect_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING # define BVH_FUNCTION_FEATURES BVH_INSTANCING
# include "bvh_traversal.h" # include "kernel/bvh/bvh_traversal.h"
#endif #endif
#if defined(__HAIR__) #if defined(__HAIR__)
# define BVH_FUNCTION_NAME bvh_intersect_hair # define BVH_FUNCTION_NAME bvh_intersect_hair
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH
# include "bvh_traversal.h" # include "kernel/bvh/bvh_traversal.h"
#endif #endif
#if defined(__OBJECT_MOTION__) #if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_motion # define BVH_FUNCTION_NAME bvh_intersect_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION
# include "bvh_traversal.h" # include "kernel/bvh/bvh_traversal.h"
#endif #endif
#if defined(__HAIR__) && defined(__OBJECT_MOTION__) #if defined(__HAIR__) && defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_hair_motion # define BVH_FUNCTION_NAME bvh_intersect_hair_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH|BVH_MOTION # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH|BVH_MOTION
# include "bvh_traversal.h" # include "kernel/bvh/bvh_traversal.h"
#endif #endif
/* Subsurface scattering BVH traversal */ /* Subsurface scattering BVH traversal */
@@ -71,12 +71,12 @@ CCL_NAMESPACE_BEGIN
#if defined(__SUBSURFACE__) #if defined(__SUBSURFACE__)
# define BVH_FUNCTION_NAME bvh_intersect_subsurface # define BVH_FUNCTION_NAME bvh_intersect_subsurface
# define BVH_FUNCTION_FEATURES BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_subsurface.h" # include "kernel/bvh/bvh_subsurface.h"
# if defined(__OBJECT_MOTION__) # if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_subsurface_motion # define BVH_FUNCTION_NAME bvh_intersect_subsurface_motion
# define BVH_FUNCTION_FEATURES BVH_MOTION|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_MOTION|BVH_HAIR
# include "bvh_subsurface.h" # include "kernel/bvh/bvh_subsurface.h"
# endif # endif
#endif /* __SUBSURFACE__ */ #endif /* __SUBSURFACE__ */
@@ -85,18 +85,18 @@ CCL_NAMESPACE_BEGIN
#if defined(__VOLUME__) #if defined(__VOLUME__)
# define BVH_FUNCTION_NAME bvh_intersect_volume # define BVH_FUNCTION_NAME bvh_intersect_volume
# define BVH_FUNCTION_FEATURES BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_volume.h" # include "kernel/bvh/bvh_volume.h"
# if defined(__INSTANCING__) # if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_instancing # define BVH_FUNCTION_NAME bvh_intersect_volume_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_volume.h" # include "kernel/bvh/bvh_volume.h"
# endif # endif
# if defined(__OBJECT_MOTION__) # if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_motion # define BVH_FUNCTION_NAME bvh_intersect_volume_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR
# include "bvh_volume.h" # include "kernel/bvh/bvh_volume.h"
# endif # endif
#endif /* __VOLUME__ */ #endif /* __VOLUME__ */
@@ -105,30 +105,30 @@ CCL_NAMESPACE_BEGIN
#if defined(__SHADOW_RECORD_ALL__) #if defined(__SHADOW_RECORD_ALL__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all # define BVH_FUNCTION_NAME bvh_intersect_shadow_all
# define BVH_FUNCTION_FEATURES 0 # define BVH_FUNCTION_FEATURES 0
# include "bvh_shadow_all.h" # include "kernel/bvh/bvh_shadow_all.h"
# if defined(__INSTANCING__) # if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_instancing # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING # define BVH_FUNCTION_FEATURES BVH_INSTANCING
# include "bvh_shadow_all.h" # include "kernel/bvh/bvh_shadow_all.h"
# endif # endif
# if defined(__HAIR__) # if defined(__HAIR__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_shadow_all.h" # include "kernel/bvh/bvh_shadow_all.h"
# endif # endif
# if defined(__OBJECT_MOTION__) # if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION
# include "bvh_shadow_all.h" # include "kernel/bvh/bvh_shadow_all.h"
# endif # endif
# if defined(__HAIR__) && defined(__OBJECT_MOTION__) # if defined(__HAIR__) && defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair_motion # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_MOTION # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_MOTION
# include "bvh_shadow_all.h" # include "kernel/bvh/bvh_shadow_all.h"
# endif # endif
#endif /* __SHADOW_RECORD_ALL__ */ #endif /* __SHADOW_RECORD_ALL__ */
@@ -137,18 +137,18 @@ CCL_NAMESPACE_BEGIN
#if defined(__VOLUME_RECORD_ALL__) #if defined(__VOLUME_RECORD_ALL__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all # define BVH_FUNCTION_NAME bvh_intersect_volume_all
# define BVH_FUNCTION_FEATURES BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_volume_all.h" # include "kernel/bvh/bvh_volume_all.h"
# if defined(__INSTANCING__) # if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all_instancing # define BVH_FUNCTION_NAME bvh_intersect_volume_all_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_volume_all.h" # include "kernel/bvh/bvh_volume_all.h"
# endif # endif
# if defined(__OBJECT_MOTION__) # if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all_motion # define BVH_FUNCTION_NAME bvh_intersect_volume_all_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR
# include "bvh_volume_all.h" # include "kernel/bvh/bvh_volume_all.h"
# endif # endif
#endif /* __VOLUME_RECORD_ALL__ */ #endif /* __VOLUME_RECORD_ALL__ */

2
intern/cycles/kernel/bvh/bvh_shadow_all.h
View File

@@ -18,7 +18,7 @@
*/ */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_shadow_all.h" # include "kernel/bvh/qbvh_shadow_all.h"
#endif #endif
#if BVH_FEATURE(BVH_HAIR) #if BVH_FEATURE(BVH_HAIR)

2
intern/cycles/kernel/bvh/bvh_subsurface.h
View File

@@ -18,7 +18,7 @@
*/ */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_subsurface.h" # include "kernel/bvh/qbvh_subsurface.h"
#endif #endif
#if BVH_FEATURE(BVH_HAIR) #if BVH_FEATURE(BVH_HAIR)

2
intern/cycles/kernel/bvh/bvh_traversal.h
View File

@@ -18,7 +18,7 @@
*/ */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_traversal.h" # include "kernel/bvh/qbvh_traversal.h"
#endif #endif
#if BVH_FEATURE(BVH_HAIR) #if BVH_FEATURE(BVH_HAIR)

2
intern/cycles/kernel/bvh/bvh_volume.h
View File

@@ -18,7 +18,7 @@
*/ */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_volume.h" # include "kernel/bvh/qbvh_volume.h"
#endif #endif
#if BVH_FEATURE(BVH_HAIR) #if BVH_FEATURE(BVH_HAIR)

2
intern/cycles/kernel/bvh/bvh_volume_all.h
View File

@@ -18,7 +18,7 @@
*/ */
#ifdef __QBVH__ #ifdef __QBVH__
# include "qbvh_volume_all.h" # include "kernel/bvh/qbvh_volume_all.h"
#endif #endif
#if BVH_FEATURE(BVH_HAIR) #if BVH_FEATURE(BVH_HAIR)

30
intern/cycles/kernel/closure/bsdf.h
View File

@@ -14,24 +14,24 @@
* limitations under the License. * limitations under the License.
*/ */
#include "../closure/bsdf_ashikhmin_velvet.h" #include "kernel/closure/bsdf_ashikhmin_velvet.h"
#include "../closure/bsdf_diffuse.h" #include "kernel/closure/bsdf_diffuse.h"
#include "../closure/bsdf_oren_nayar.h" #include "kernel/closure/bsdf_oren_nayar.h"
#include "../closure/bsdf_phong_ramp.h" #include "kernel/closure/bsdf_phong_ramp.h"
#include "../closure/bsdf_diffuse_ramp.h" #include "kernel/closure/bsdf_diffuse_ramp.h"
#include "../closure/bsdf_microfacet.h" #include "kernel/closure/bsdf_microfacet.h"
#include "../closure/bsdf_microfacet_multi.h" #include "kernel/closure/bsdf_microfacet_multi.h"
#include "../closure/bsdf_reflection.h" #include "kernel/closure/bsdf_reflection.h"
#include "../closure/bsdf_refraction.h" #include "kernel/closure/bsdf_refraction.h"
#include "../closure/bsdf_transparent.h" #include "kernel/closure/bsdf_transparent.h"
#include "../closure/bsdf_ashikhmin_shirley.h" #include "kernel/closure/bsdf_ashikhmin_shirley.h"
#include "../closure/bsdf_toon.h" #include "kernel/closure/bsdf_toon.h"
#include "../closure/bsdf_hair.h" #include "kernel/closure/bsdf_hair.h"
#ifdef __SUBSURFACE__ #ifdef __SUBSURFACE__
# include "../closure/bssrdf.h" # include "kernel/closure/bssrdf.h"
#endif #endif
#ifdef __VOLUME__ #ifdef __VOLUME__
# include "../closure/volume.h" # include "kernel/closure/volume.h"
#endif #endif
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/kernel/closure/bsdf_microfacet_multi.h
View File

@@ -313,18 +313,18 @@ ccl_device_forceinline float mf_glass_pdf(const float3 wi, const float3 wo, cons
#define MF_PHASE_FUNCTION glass #define MF_PHASE_FUNCTION glass
#define MF_MULTI_GLASS #define MF_MULTI_GLASS
#include "bsdf_microfacet_multi_impl.h" #include "kernel/closure/bsdf_microfacet_multi_impl.h"
/* The diffuse phase function is not implemented as a node yet. */ /* The diffuse phase function is not implemented as a node yet. */
#if 0 #if 0
#define MF_PHASE_FUNCTION diffuse #define MF_PHASE_FUNCTION diffuse
#define MF_MULTI_DIFFUSE #define MF_MULTI_DIFFUSE
#include "bsdf_microfacet_multi_impl.h" #include "kernel/closure/bsdf_microfacet_multi_impl.h"
#endif #endif
#define MF_PHASE_FUNCTION glossy #define MF_PHASE_FUNCTION glossy
#define MF_MULTI_GLOSSY #define MF_MULTI_GLOSSY
#include "bsdf_microfacet_multi_impl.h" #include "kernel/closure/bsdf_microfacet_multi_impl.h"
ccl_device void bsdf_microfacet_multi_ggx_blur(ShaderClosure *sc, float roughness) ccl_device void bsdf_microfacet_multi_ggx_blur(ShaderClosure *sc, float roughness)
{ {

26
intern/cycles/kernel/geom/geom.h
View File

@@ -14,19 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
#include "geom_attribute.h" #include "kernel/geom/geom_attribute.h"
#include "geom_object.h" #include "kernel/geom/geom_object.h"
#ifdef __PATCH_EVAL__ #ifdef __PATCH_EVAL__
# include "geom_patch.h" # include "kernel/geom/geom_patch.h"
#endif #endif
#include "geom_triangle.h" #include "kernel/geom/geom_triangle.h"
#include "geom_subd_triangle.h" #include "kernel/geom/geom_subd_triangle.h"
#include "geom_triangle_intersect.h" #include "kernel/geom/geom_triangle_intersect.h"
#include "geom_motion_triangle.h" #include "kernel/geom/geom_motion_triangle.h"
#include "geom_motion_triangle_intersect.h" #include "kernel/geom/geom_motion_triangle_intersect.h"
#include "geom_motion_triangle_shader.h" #include "kernel/geom/geom_motion_triangle_shader.h"
#include "geom_motion_curve.h" #include "kernel/geom/geom_motion_curve.h"
#include "geom_curve.h" #include "kernel/geom/geom_curve.h"
#include "geom_volume.h" #include "kernel/geom/geom_volume.h"
#include "geom_primitive.h" #include "kernel/geom/geom_primitive.h"

16
intern/cycles/kernel/kernel.h
View File

@@ -19,8 +19,8 @@
/* CPU Kernel Interface */ /* CPU Kernel Interface */
#include "util_types.h" #include "util/util_types.h"
#include "kernel_types.h" #include "kernel/kernel_types.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -48,31 +48,31 @@ void kernel_tex_copy(KernelGlobals *kg,
ExtensionType extension = EXTENSION_REPEAT); ExtensionType extension = EXTENSION_REPEAT);
#define KERNEL_ARCH cpu #define KERNEL_ARCH cpu
#include "kernels/cpu/kernel_cpu.h" #include "kernel/kernels/cpu/kernel_cpu.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
# define KERNEL_ARCH cpu_sse2 # define KERNEL_ARCH cpu_sse2
# include "kernels/cpu/kernel_cpu.h" # include "kernel/kernels/cpu/kernel_cpu.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
# define KERNEL_ARCH cpu_sse3 # define KERNEL_ARCH cpu_sse3
# include "kernels/cpu/kernel_cpu.h" # include "kernel/kernels/cpu/kernel_cpu.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
# define KERNEL_ARCH cpu_sse41 # define KERNEL_ARCH cpu_sse41
# include "kernels/cpu/kernel_cpu.h" # include "kernel/kernels/cpu/kernel_cpu.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
# define KERNEL_ARCH cpu_avx # define KERNEL_ARCH cpu_avx
# include "kernels/cpu/kernel_cpu.h" # include "kernel/kernels/cpu/kernel_cpu.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
# define KERNEL_ARCH cpu_avx2 # define KERNEL_ARCH cpu_avx2
# include "kernels/cpu/kernel_cpu.h" # include "kernel/kernels/cpu/kernel_cpu.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */
CCL_NAMESPACE_END CCL_NAMESPACE_END

12
intern/cycles/kernel/kernel_compat_cpu.h
View File

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

4
intern/cycles/kernel/kernel_compat_cuda.h
View File

@@ -60,8 +60,8 @@
/* Types */ /* Types */
#include "util_half.h" #include "util/util_half.h"
#include "util_types.h" #include "util/util_types.h"
/* Work item functions */ /* Work item functions */

4
intern/cycles/kernel/kernel_compat_opencl.h
View File

@@ -143,8 +143,8 @@
/* define NULL */ /* define NULL */
#define NULL 0 #define NULL 0
#include "util_half.h" #include "util/util_half.h"
#include "util_types.h" #include "util/util_types.h"
#endif /* __KERNEL_COMPAT_OPENCL_H__ */ #endif /* __KERNEL_COMPAT_OPENCL_H__ */

6
intern/cycles/kernel/kernel_globals.h
View File

@@ -47,7 +47,7 @@ typedef struct KernelGlobals {
# define KERNEL_TEX(type, ttype, name) ttype name; # define KERNEL_TEX(type, ttype, name) ttype name;
# define KERNEL_IMAGE_TEX(type, ttype, name) # define KERNEL_IMAGE_TEX(type, ttype, name)
# include "kernel_textures.h" # include "kernel/kernel_textures.h"
KernelData __data; KernelData __data;
@@ -97,7 +97,7 @@ typedef struct KernelGlobals {
# define KERNEL_TEX(type, ttype, name) const __constant__ __device__ type *name; # define KERNEL_TEX(type, ttype, name) const __constant__ __device__ type *name;
# endif # endif
# define KERNEL_IMAGE_TEX(type, ttype, name) ttype name; # define KERNEL_IMAGE_TEX(type, ttype, name) ttype name;
# include "kernel_textures.h" # include "kernel/kernel_textures.h"
#endif /* __KERNEL_CUDA__ */ #endif /* __KERNEL_CUDA__ */
@@ -110,7 +110,7 @@ typedef ccl_addr_space struct KernelGlobals {
# define KERNEL_TEX(type, ttype, name) \ # define KERNEL_TEX(type, ttype, name) \
ccl_global type *name; ccl_global type *name;
# include "kernel_textures.h" # include "kernel/kernel_textures.h"
# ifdef __SPLIT_KERNEL__ # ifdef __SPLIT_KERNEL__
SplitData split_data; SplitData split_data;

13
intern/cycles/kernel/kernel_math.h
View File

@@ -17,12 +17,11 @@
#ifndef __KERNEL_MATH_H__ #ifndef __KERNEL_MATH_H__
#define __KERNEL_MATH_H__ #define __KERNEL_MATH_H__
#include "util_color.h" #include "util/util_color.h"
#include "util_math.h" #include "util/util_math.h"
#include "util_math_fast.h" #include "util/util_math_fast.h"
#include "util_math_intersect.h" #include "util/util_math_intersect.h"
#include "util_texture.h" #include "util/util_texture.h"
#include "util_transform.h" #include "util/util_transform.h"
#endif /* __KERNEL_MATH_H__ */ #endif /* __KERNEL_MATH_H__ */

44
intern/cycles/kernel/kernel_path.h
View File

@@ -15,41 +15,41 @@
*/ */
#ifdef __OSL__ #ifdef __OSL__
# include "osl_shader.h" # include "kernel/osl/osl_shader.h"
#endif #endif
#include "kernel_random.h" #include "kernel/kernel_random.h"
#include "kernel_projection.h" #include "kernel/kernel_projection.h"
#include "kernel_montecarlo.h" #include "kernel/kernel_montecarlo.h"
#include "kernel_differential.h" #include "kernel/kernel_differential.h"
#include "kernel_camera.h" #include "kernel/kernel_camera.h"
#include "geom/geom.h" #include "kernel/geom/geom.h"
#include "bvh/bvh.h" #include "kernel/bvh/bvh.h"
#include "kernel_accumulate.h" #include "kernel/kernel_accumulate.h"
#include "kernel_shader.h" #include "kernel/kernel_shader.h"
#include "kernel_light.h" #include "kernel/kernel_light.h"
#include "kernel_passes.h" #include "kernel/kernel_passes.h"
#ifdef __SUBSURFACE__ #ifdef __SUBSURFACE__
# include "kernel_subsurface.h" # include "kernel/kernel_subsurface.h"
#endif #endif
#ifdef __VOLUME__ #ifdef __VOLUME__
# include "kernel_volume.h" # include "kernel/kernel_volume.h"
#endif #endif
#include "kernel_path_state.h" #include "kernel/kernel_path_state.h"
#include "kernel_shadow.h" #include "kernel/kernel_shadow.h"
#include "kernel_emission.h" #include "kernel/kernel_emission.h"
#include "kernel_path_common.h" #include "kernel/kernel_path_common.h"
#include "kernel_path_surface.h" #include "kernel/kernel_path_surface.h"
#include "kernel_path_volume.h" #include "kernel/kernel_path_volume.h"
#include "kernel_path_subsurface.h" #include "kernel/kernel_path_subsurface.h"
#ifdef __KERNEL_DEBUG__ #ifdef __KERNEL_DEBUG__
# include "kernel_debug.h" # include "kernel/kernel_debug.h"
#endif #endif
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

2
intern/cycles/kernel/kernel_path_common.h
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "util_hash.h" #include "util/util_hash.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

2
intern/cycles/kernel/kernel_random.h
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "kernel_jitter.h" #include "kernel/kernel_jitter.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

10
intern/cycles/kernel/kernel_shader.h
View File

@@ -24,12 +24,12 @@
* *
*/ */
#include "closure/alloc.h" #include "kernel/closure/alloc.h"
#include "closure/bsdf_util.h" #include "kernel/closure/bsdf_util.h"
#include "closure/bsdf.h" #include "kernel/closure/bsdf.h"
#include "closure/emissive.h" #include "kernel/closure/emissive.h"
#include "svm/svm.h" #include "kernel/svm/svm.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

6
intern/cycles/kernel/kernel_types.h
View File

@@ -17,9 +17,9 @@
#ifndef __KERNEL_TYPES_H__ #ifndef __KERNEL_TYPES_H__
#define __KERNEL_TYPES_H__ #define __KERNEL_TYPES_H__
#include "kernel_math.h" #include "kernel/kernel_math.h"
#include "svm/svm_types.h" #include "kernel/svm/svm_types.h"
#include "util_static_assert.h" #include "util/util_static_assert.h"
#ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
# define __KERNEL_CPU__ # define __KERNEL_CPU__

6
intern/cycles/kernel/kernels/cpu/kernel.cpp
View File

@@ -56,9 +56,9 @@
/* do nothing */ /* do nothing */
#endif #endif
#include "kernel.h" #include "kernel/kernel.h"
#define KERNEL_ARCH cpu #define KERNEL_ARCH cpu
#include "kernel_cpu_impl.h" #include "kernel/kernels/cpu/kernel_cpu_impl.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
@@ -90,7 +90,7 @@ void kernel_tex_copy(KernelGlobals *kg,
kg->tname.width = width; \ kg->tname.width = width; \
} }
#define KERNEL_IMAGE_TEX(type, ttype, tname) #define KERNEL_IMAGE_TEX(type, ttype, tname)
#include "kernel_textures.h" #include "kernel/kernel_textures.h"
else if(strstr(name, "__tex_image_float4")) { else if(strstr(name, "__tex_image_float4")) {
texture_image_float4 *tex = NULL; texture_image_float4 *tex = NULL;

6
intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
View File

@@ -28,10 +28,10 @@
# define __KERNEL_AVX__ # define __KERNEL_AVX__
#endif #endif
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx # define KERNEL_ARCH cpu_avx
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */

6
intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
View File

@@ -29,10 +29,10 @@
# define __KERNEL_AVX2__ # define __KERNEL_AVX2__
#endif #endif
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx2 # define KERNEL_ARCH cpu_avx2
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */

54
intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
View File

@@ -20,39 +20,39 @@
* simply includes this file without worry of copying actual implementation over. * simply includes this file without worry of copying actual implementation over.
*/ */
#include "kernel_compat_cpu.h" #include "kernel/kernel_compat_cpu.h"
#ifndef __SPLIT_KERNEL__ #ifndef __SPLIT_KERNEL__
# include "kernel_math.h" # include "kernel/kernel_math.h"
# include "kernel_types.h" # include "kernel/kernel_types.h"
# include "split/kernel_split_data.h" # include "kernel/split/kernel_split_data.h"
# include "kernel_globals.h" # include "kernel/kernel_globals.h"
# include "kernel_cpu_image.h" # include "kernel/kernels/cpu/kernel_cpu_image.h"
# include "kernel_film.h" # include "kernel/kernel_film.h"
# include "kernel_path.h" # include "kernel/kernel_path.h"
# include "kernel_path_branched.h" # include "kernel/kernel_path_branched.h"
# include "kernel_bake.h" # include "kernel/kernel_bake.h"
#else #else
# include "split/kernel_split_common.h" # include "kernel/split/kernel_split_common.h"
# include "split/kernel_data_init.h" # include "kernel/split/kernel_data_init.h"
# include "split/kernel_path_init.h" # include "kernel/split/kernel_path_init.h"
# include "split/kernel_scene_intersect.h" # include "kernel/split/kernel_scene_intersect.h"
# include "split/kernel_lamp_emission.h" # include "kernel/split/kernel_lamp_emission.h"
# include "split/kernel_do_volume.h" # include "kernel/split/kernel_do_volume.h"
# include "split/kernel_queue_enqueue.h" # include "kernel/split/kernel_queue_enqueue.h"
# include "split/kernel_indirect_background.h" # include "kernel/split/kernel_indirect_background.h"
# include "split/kernel_shader_eval.h" # include "kernel/split/kernel_shader_eval.h"
# include "split/kernel_holdout_emission_blurring_pathtermination_ao.h" # include "kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h"
# include "split/kernel_subsurface_scatter.h" # include "kernel/split/kernel_subsurface_scatter.h"
# include "split/kernel_direct_lighting.h" # include "kernel/split/kernel_direct_lighting.h"
# include "split/kernel_shadow_blocked_ao.h" # include "kernel/split/kernel_shadow_blocked_ao.h"
# include "split/kernel_shadow_blocked_dl.h" # include "kernel/split/kernel_shadow_blocked_dl.h"
# include "split/kernel_next_iteration_setup.h" # include "kernel/split/kernel_next_iteration_setup.h"
# include "split/kernel_indirect_subsurface.h" # include "kernel/split/kernel_indirect_subsurface.h"
# include "split/kernel_buffer_update.h" # include "kernel/split/kernel_buffer_update.h"
#endif #endif
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN

4
intern/cycles/kernel/kernels/cpu/kernel_split.cpp
View File

@@ -57,7 +57,7 @@
/* do nothing */ /* do nothing */
#endif #endif
#include "kernel.h" #include "kernel/kernel.h"
#define KERNEL_ARCH cpu #define KERNEL_ARCH cpu
#include "kernel_cpu_impl.h" #include "kernel/kernels/cpu/kernel_cpu_impl.h"

6
intern/cycles/kernel/kernels/cpu/kernel_split_avx.cpp
View File

@@ -29,10 +29,10 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx # define KERNEL_ARCH cpu_avx
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */

6
intern/cycles/kernel/kernels/cpu/kernel_split_avx2.cpp
View File

@@ -31,10 +31,10 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx2 # define KERNEL_ARCH cpu_avx2
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */

6
intern/cycles/kernel/kernels/cpu/kernel_split_sse2.cpp
View File

@@ -25,10 +25,10 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse2 # define KERNEL_ARCH cpu_sse2
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */

6
intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp
View File

@@ -27,10 +27,10 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse3 # define KERNEL_ARCH cpu_sse3
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */

6
intern/cycles/kernel/kernels/cpu/kernel_split_sse41.cpp
View File

@@ -28,10 +28,10 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse41 # define KERNEL_ARCH cpu_sse41
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */

6
intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp
View File

@@ -23,10 +23,10 @@
# define __KERNEL_SSE2__ # define __KERNEL_SSE2__
#endif #endif
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse2 # define KERNEL_ARCH cpu_sse2
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */

6
intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp
View File

@@ -25,10 +25,10 @@
# define __KERNEL_SSSE3__ # define __KERNEL_SSSE3__
#endif #endif
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse3 # define KERNEL_ARCH cpu_sse3
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */

6
intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp
View File

@@ -26,10 +26,10 @@
# define __KERNEL_SSE41__ # define __KERNEL_SSE41__
#endif #endif
#include "util_optimization.h" #include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
# include "kernel.h" # include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse41 # define KERNEL_ARCH cpu_sse41
# include "kernel_cpu_impl.h" # include "kernel/kernels/cpu//kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */ #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */

16
intern/cycles/kernel/kernels/cuda/kernel.cu
View File

@@ -18,15 +18,15 @@
#ifdef __CUDA_ARCH__ #ifdef __CUDA_ARCH__
#include "../../kernel_compat_cuda.h" #include "kernel/kernel_compat_cuda.h"
#include "kernel_config.h" #include "kernel_config.h"
#include "../../kernel_math.h" #include "kernel/kernel_math.h"
#include "../../kernel_types.h" #include "kernel/kernel_types.h"
#include "../../kernel_globals.h" #include "kernel/kernel_globals.h"
#include "../../kernel_film.h" #include "kernel/kernel_film.h"
#include "../../kernel_path.h" #include "kernel/kernel_path.h"
#include "../../kernel_path_branched.h" #include "kernel/kernel_path_branched.h"
#include "../../kernel_bake.h" #include "kernel/kernel_bake.h"
/* kernels */ /* kernels */
extern "C" __global__ void extern "C" __global__ void

38
intern/cycles/kernel/kernels/cuda/kernel_split.cu
View File

@@ -20,28 +20,28 @@
#define __SPLIT_KERNEL__ #define __SPLIT_KERNEL__
#include "../../kernel_compat_cuda.h" #include "kernel/kernel_compat_cuda.h"
#include "kernel_config.h" #include "kernel_config.h"
#include "../../split/kernel_split_common.h" #include "kernel/split/kernel_split_common.h"
#include "../../split/kernel_data_init.h" #include "kernel/split/kernel_data_init.h"
#include "../../split/kernel_path_init.h" #include "kernel/split/kernel_path_init.h"
#include "../../split/kernel_scene_intersect.h" #include "kernel/split/kernel_scene_intersect.h"
#include "../../split/kernel_lamp_emission.h" #include "kernel/split/kernel_lamp_emission.h"
#include "../../split/kernel_do_volume.h" #include "kernel/split/kernel_do_volume.h"
#include "../../split/kernel_queue_enqueue.h" #include "kernel/split/kernel_queue_enqueue.h"
#include "../../split/kernel_indirect_background.h" #include "kernel/split/kernel_indirect_background.h"
#include "../../split/kernel_shader_eval.h" #include "kernel/split/kernel_shader_eval.h"
#include "../../split/kernel_holdout_emission_blurring_pathtermination_ao.h" #include "kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h"
#include "../../split/kernel_subsurface_scatter.h" #include "kernel/split/kernel_subsurface_scatter.h"
#include "../../split/kernel_direct_lighting.h" #include "kernel/split/kernel_direct_lighting.h"
#include "../../split/kernel_shadow_blocked_ao.h" #include "kernel/split/kernel_shadow_blocked_ao.h"
#include "../../split/kernel_shadow_blocked_dl.h" #include "kernel/split/kernel_shadow_blocked_dl.h"
#include "../../split/kernel_next_iteration_setup.h" #include "kernel/split/kernel_next_iteration_setup.h"
#include "../../split/kernel_indirect_subsurface.h" #include "kernel/split/kernel_indirect_subsurface.h"
#include "../../split/kernel_buffer_update.h" #include "kernel/split/kernel_buffer_update.h"
#include "../../kernel_film.h" #include "kernel/kernel_film.h"
/* kernels */ /* kernels */
extern "C" __global__ void extern "C" __global__ void

56
intern/cycles/kernel/kernels/opencl/kernel.cl
View File

@@ -16,34 +16,34 @@
/* OpenCL kernel entry points - unfinished */ /* OpenCL kernel entry points - unfinished */
#include "../../kernel_compat_opencl.h" #include "kernel/kernel_compat_opencl.h"
#include "../../kernel_math.h" #include "kernel/kernel_math.h"
#include "../../kernel_types.h" #include "kernel/kernel_types.h"
#include "../../kernel_globals.h" #include "kernel/kernel_globals.h"
#include "../../kernel_image_opencl.h" #include "kernel/kernel_image_opencl.h"
#include "../../kernel_film.h" #include "kernel/kernel_film.h"
#if defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) #if defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__)
# include "../../kernel_path.h" # include "kernel/kernel_path.h"
# include "../../kernel_path_branched.h" # include "kernel/kernel_path_branched.h"
#else /* __COMPILE_ONLY_MEGAKERNEL__ */ #else /* __COMPILE_ONLY_MEGAKERNEL__ */
/* Include only actually used headers for the case /* Include only actually used headers for the case
* when path tracing kernels are not needed. * when path tracing kernels are not needed.
*/ */
# include "../../kernel_random.h" # include "kernel/kernel_random.h"
# include "../../kernel_differential.h" # include "kernel/kernel_differential.h"
# include "../../kernel_montecarlo.h" # include "kernel/kernel_montecarlo.h"
# include "../../kernel_projection.h" # include "kernel/kernel_projection.h"
# include "../../geom/geom.h" # include "kernel/geom/geom.h"
# include "../../bvh/bvh.h" # include "kernel/bvh/bvh.h"
# include "../../kernel_accumulate.h" # include "kernel/kernel_accumulate.h"
# include "../../kernel_camera.h" # include "kernel/kernel_camera.h"
# include "../../kernel_shader.h" # include "kernel/kernel_shader.h"
#endif /* defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) */ #endif /* defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) */
#include "../../kernel_bake.h" #include "kernel/kernel_bake.h"
#ifdef __COMPILE_ONLY_MEGAKERNEL__ #ifdef __COMPILE_ONLY_MEGAKERNEL__
@@ -54,7 +54,7 @@ __kernel void kernel_ocl_path_trace(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int sample, int sample,
int sx, int sy, int sw, int sh, int offset, int stride) int sx, int sy, int sw, int sh, int offset, int stride)
@@ -65,7 +65,7 @@ __kernel void kernel_ocl_path_trace(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
kg->name = name; kg->name = name;
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int x = sx + ccl_global_id(0); int x = sx + ccl_global_id(0);
int y = sy + ccl_global_id(1); int y = sy + ccl_global_id(1);
@@ -84,7 +84,7 @@ __kernel void kernel_ocl_shader(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int type, int sx, int sw, int offset, int sample) int type, int sx, int sw, int offset, int sample)
{ {
@@ -94,7 +94,7 @@ __kernel void kernel_ocl_shader(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
kg->name = name; kg->name = name;
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int x = sx + ccl_global_id(0); int x = sx + ccl_global_id(0);
@@ -116,7 +116,7 @@ __kernel void kernel_ocl_bake(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int type, int filter, int sx, int sw, int offset, int sample) int type, int filter, int sx, int sw, int offset, int sample)
{ {
@@ -126,7 +126,7 @@ __kernel void kernel_ocl_bake(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
kg->name = name; kg->name = name;
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int x = sx + ccl_global_id(0); int x = sx + ccl_global_id(0);
@@ -146,7 +146,7 @@ __kernel void kernel_ocl_convert_to_byte(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
float sample_scale, float sample_scale,
int sx, int sy, int sw, int sh, int offset, int stride) int sx, int sy, int sw, int sh, int offset, int stride)
@@ -157,7 +157,7 @@ __kernel void kernel_ocl_convert_to_byte(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
kg->name = name; kg->name = name;
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int x = sx + ccl_global_id(0); int x = sx + ccl_global_id(0);
int y = sy + ccl_global_id(1); int y = sy + ccl_global_id(1);
@@ -173,7 +173,7 @@ __kernel void kernel_ocl_convert_to_half_float(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
float sample_scale, float sample_scale,
int sx, int sy, int sw, int sh, int offset, int stride) int sx, int sy, int sw, int sh, int offset, int stride)
@@ -184,7 +184,7 @@ __kernel void kernel_ocl_convert_to_half_float(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
kg->name = name; kg->name = name;
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int x = sx + ccl_global_id(0); int x = sx + ccl_global_id(0);
int y = sy + ccl_global_id(1); int y = sy + ccl_global_id(1);

6
intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl
View File

@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "kernel_compat_opencl.h" #include "kernel/kernel_compat_opencl.h"
#include "split/kernel_split_common.h" #include "kernel/split/kernel_split_common.h"
#include "split/kernel_buffer_update.h" #include "kernel/split/kernel_buffer_update.h"
__kernel void kernel_ocl_path_trace_buffer_update( __kernel void kernel_ocl_path_trace_buffer_update(
ccl_global char *kg, ccl_global char *kg,

10
intern/cycles/kernel/kernels/opencl/kernel_data_init.cl
View File

@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "kernel_compat_opencl.h" #include "kernel/kernel_compat_opencl.h"
#include "split/kernel_split_common.h" #include "kernel/split/kernel_split_common.h"
#include "split/kernel_data_init.h" #include "kernel/split/kernel_data_init.h"
__kernel void kernel_ocl_path_trace_data_init( __kernel void kernel_ocl_path_trace_data_init(
ccl_global char *kg, ccl_global char *kg,
@@ -28,7 +28,7 @@ __kernel void kernel_ocl_path_trace_data_init(
#define KERNEL_TEX(type, ttype, name) \ #define KERNEL_TEX(type, ttype, name) \
ccl_global type *name, ccl_global type *name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
int start_sample, int start_sample,
int end_sample, int end_sample,
@@ -48,7 +48,7 @@ __kernel void kernel_ocl_path_trace_data_init(
rng_state, rng_state,
#define KERNEL_TEX(type, ttype, name) name, #define KERNEL_TEX(type, ttype, name) name,
#include "../../kernel_textures.h" #include "kernel/kernel_textures.h"
start_sample, start_sample,
end_sample, end_sample,

6
intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
View File

@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "kernel_compat_opencl.h" #include "kernel/kernel_compat_opencl.h"
#include "split/kernel_split_common.h" #include "kernel/split/kernel_split_common.h"
#include "split/kernel_direct_lighting.h" #include "kernel/split/kernel_direct_lighting.h"
__kernel void kernel_ocl_path_trace_direct_lighting( __kernel void kernel_ocl_path_trace_direct_lighting(
ccl_global char *kg, ccl_global char *kg,

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