griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Julian Eisel
2017-03-29 23:01:16 +02:00
parent e922e42fe6 66ef0b8834
commit 15336eb262
242 changed files with 1694 additions and 1731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/app/CMakeLists.txt
View File

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

16
intern/cycles/app/cycles_server.cpp
View File

@@ -16,15 +16,15 @@
#include <stdio.h>
#include "device.h"
#include "device/device.h"
#include "util_args.h"
#include "util_foreach.h"
#include "util_path.h"
#include "util_stats.h"
#include "util_string.h"
#include "util_task.h"
#include "util_logging.h"
#include "util/util_args.h"
#include "util/util_foreach.h"
#include "util/util_path.h"
#include "util/util_stats.h"
#include "util/util_string.h"
#include "util/util_task.h"
#include "util/util_logging.h"
using namespace ccl;

36
intern/cycles/app/cycles_standalone.cpp
View File

@@ -16,29 +16,29 @@
#include <stdio.h>
#include "buffers.h"
#include "camera.h"
#include "device.h"
#include "scene.h"
#include "session.h"
#include "integrator.h"
#include "render/buffers.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/scene.h"
#include "render/session.h"
#include "render/integrator.h"
#include "util_args.h"
#include "util_foreach.h"
#include "util_function.h"
#include "util_logging.h"
#include "util_path.h"
#include "util_progress.h"
#include "util_string.h"
#include "util_time.h"
#include "util_transform.h"
#include "util_version.h"
#include "util/util_args.h"
#include "util/util_foreach.h"
#include "util/util_function.h"
#include "util/util_logging.h"
#include "util/util_path.h"
#include "util/util_progress.h"
#include "util/util_string.h"
#include "util/util_time.h"
#include "util/util_transform.h"
#include "util/util_version.h"
#ifdef WITH_CYCLES_STANDALONE_GUI
#include "util_view.h"
#include "util/util_view.h"
#endif
#include "cycles_xml.h"
#include "app/cycles_xml.h"
CCL_NAMESPACE_BEGIN

42
intern/cycles/app/cycles_xml.cpp
View File

@@ -20,31 +20,31 @@
#include <algorithm>
#include <iterator>
#include "node_xml.h"
#include "graph/node_xml.h"
#include "background.h"
#include "camera.h"
#include "film.h"
#include "graph.h"
#include "integrator.h"
#include "light.h"
#include "mesh.h"
#include "nodes.h"
#include "object.h"
#include "osl.h"
#include "shader.h"
#include "scene.h"
#include "render/background.h"
#include "render/camera.h"
#include "render/film.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/object.h"
#include "render/osl.h"
#include "render/shader.h"
#include "render/scene.h"
#include "subd_patch.h"
#include "subd_split.h"
#include "subd/subd_patch.h"
#include "subd/subd_split.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_path.h"
#include "util_transform.h"
#include "util_xml.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_path.h"
#include "util/util_transform.h"
#include "util/util_xml.h"
#include "cycles_xml.h"
#include "app/cycles_xml.h"
CCL_NAMESPACE_BEGIN

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,25 +15,25 @@
* limitations under the License.
*/
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "curves.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/curves.h"
#include "bvh.h"
#include "bvh_build.h"
#include "bvh_node.h"
#include "bvh_params.h"
#include "bvh_unaligned.h"
#include "bvh/bvh.h"
#include "bvh/bvh_build.h"
#include "bvh/bvh_node.h"
#include "bvh/bvh_params.h"
#include "bvh/bvh_unaligned.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_map.h"
#include "util_progress.h"
#include "util_system.h"
#include "util_types.h"
#include "util_math.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_map.h"
#include "util/util_progress.h"
#include "util/util_system.h"
#include "util/util_types.h"
#include "util/util_math.h"
CCL_NAMESPACE_BEGIN
@@ -424,7 +424,7 @@ static bool node_bvh_is_unaligned(const BVHNode *node)
{
const BVHNode *node0 = node->get_child(0),
*node1 = node->get_child(1);
return node0->is_unaligned() || node1->is_unaligned();
return node0->is_unaligned || node1->is_unaligned;
}
RegularBVH::RegularBVH(const BVHParams& params_, const vector<Object*>& objects_)
@@ -438,19 +438,19 @@ void RegularBVH::pack_leaf(const BVHStackEntry& e,
assert(e.idx + BVH_NODE_LEAF_SIZE <= pack.leaf_nodes.size());
float4 data[BVH_NODE_LEAF_SIZE];
memset(data, 0, sizeof(data));
if(leaf->num_triangles() == 1 && pack.prim_index[leaf->m_lo] == -1) {
if(leaf->num_triangles() == 1 && pack.prim_index[leaf->lo] == -1) {
/* object */
data[0].x = __int_as_float(~(leaf->m_lo));
data[0].x = __int_as_float(~(leaf->lo));
data[0].y = __int_as_float(0);
}
else {
/* triangle */
data[0].x = __int_as_float(leaf->m_lo);
data[0].y = __int_as_float(leaf->m_hi);
data[0].x = __int_as_float(leaf->lo);
data[0].y = __int_as_float(leaf->hi);
}
data[0].z = __uint_as_float(leaf->m_visibility);
data[0].z = __uint_as_float(leaf->visibility);
if(leaf->num_triangles() != 0) {
data[0].w = __uint_as_float(pack.prim_type[leaf->m_lo]);
data[0].w = __uint_as_float(pack.prim_type[leaf->lo]);
}
memcpy(&pack.leaf_nodes[e.idx], data, sizeof(float4)*BVH_NODE_LEAF_SIZE);
@@ -460,7 +460,7 @@ void RegularBVH::pack_inner(const BVHStackEntry& e,
const BVHStackEntry& e0,
const BVHStackEntry& e1)
{
if(e0.node->is_unaligned() || e1.node->is_unaligned()) {
if(e0.node->is_unaligned || e1.node->is_unaligned) {
pack_unaligned_inner(e, e0, e1);
} else {
pack_aligned_inner(e, e0, e1);
@@ -472,9 +472,9 @@ void RegularBVH::pack_aligned_inner(const BVHStackEntry& e,
const BVHStackEntry& e1)
{
pack_aligned_node(e.idx,
e0.node->m_bounds, e1.node->m_bounds,
e0.node->bounds, e1.node->bounds,
e0.encodeIdx(), e1.encodeIdx(),
e0.node->m_visibility, e1.node->m_visibility);
e0.node->visibility, e1.node->visibility);
}
void RegularBVH::pack_aligned_node(int idx,
@@ -515,10 +515,10 @@ void RegularBVH::pack_unaligned_inner(const BVHStackEntry& e,
pack_unaligned_node(e.idx,
e0.node->get_aligned_space(),
e1.node->get_aligned_space(),
e0.node->m_bounds,
e1.node->m_bounds,
e0.node->bounds,
e1.node->bounds,
e0.encodeIdx(), e1.encodeIdx(),
e0.node->m_visibility, e1.node->m_visibility);
e0.node->visibility, e1.node->visibility);
}
void RegularBVH::pack_unaligned_node(int idx,
@@ -769,18 +769,18 @@ static bool node_qbvh_is_unaligned(const BVHNode *node)
*node1 = node->get_child(1);
bool has_unaligned = false;
if(node0->is_leaf()) {
has_unaligned |= node0->is_unaligned();
has_unaligned |= node0->is_unaligned;
}
else {
has_unaligned |= node0->get_child(0)->is_unaligned();
has_unaligned |= node0->get_child(1)->is_unaligned();
has_unaligned |= node0->get_child(0)->is_unaligned;
has_unaligned |= node0->get_child(1)->is_unaligned;
}
if(node1->is_leaf()) {
has_unaligned |= node1->is_unaligned();
has_unaligned |= node1->is_unaligned;
}
else {
has_unaligned |= node1->get_child(0)->is_unaligned();
has_unaligned |= node1->get_child(1)->is_unaligned();
has_unaligned |= node1->get_child(0)->is_unaligned;
has_unaligned |= node1->get_child(1)->is_unaligned;
}
return has_unaligned;
}
@@ -795,19 +795,19 @@ void QBVH::pack_leaf(const BVHStackEntry& e, const LeafNode *leaf)
{
float4 data[BVH_QNODE_LEAF_SIZE];
memset(data, 0, sizeof(data));
if(leaf->num_triangles() == 1 && pack.prim_index[leaf->m_lo] == -1) {
if(leaf->num_triangles() == 1 && pack.prim_index[leaf->lo] == -1) {
/* object */
data[0].x = __int_as_float(~(leaf->m_lo));
data[0].x = __int_as_float(~(leaf->lo));
data[0].y = __int_as_float(0);
}
else {
/* triangle */
data[0].x = __int_as_float(leaf->m_lo);
data[0].y = __int_as_float(leaf->m_hi);
data[0].x = __int_as_float(leaf->lo);
data[0].y = __int_as_float(leaf->hi);
}
data[0].z = __uint_as_float(leaf->m_visibility);
data[0].z = __uint_as_float(leaf->visibility);
if(leaf->num_triangles() != 0) {
data[0].w = __uint_as_float(pack.prim_type[leaf->m_lo]);
data[0].w = __uint_as_float(pack.prim_type[leaf->lo]);
}
memcpy(&pack.leaf_nodes[e.idx], data, sizeof(float4)*BVH_QNODE_LEAF_SIZE);
@@ -823,7 +823,7 @@ void QBVH::pack_inner(const BVHStackEntry& e,
*/
if(params.use_unaligned_nodes) {
for(int i = 0; i < num; i++) {
if(en[i].node->is_unaligned()) {
if(en[i].node->is_unaligned) {
has_unaligned = true;
break;
}
@@ -848,15 +848,15 @@ void QBVH::pack_aligned_inner(const BVHStackEntry& e,
BoundBox bounds[4];
int child[4];
for(int i = 0; i < num; ++i) {
bounds[i] = en[i].node->m_bounds;
bounds[i] = en[i].node->bounds;
child[i] = en[i].encodeIdx();
}
pack_aligned_node(e.idx,
bounds,
child,
e.node->m_visibility,
e.node->m_time_from,
e.node->m_time_to,
e.node->visibility,
e.node->time_from,
e.node->time_to,
num);
}
@@ -917,16 +917,16 @@ void QBVH::pack_unaligned_inner(const BVHStackEntry& e,
int child[4];
for(int i = 0; i < num; ++i) {
aligned_space[i] = en[i].node->get_aligned_space();
bounds[i] = en[i].node->m_bounds;
bounds[i] = en[i].node->bounds;
child[i] = en[i].encodeIdx();
}
pack_unaligned_node(e.idx,
aligned_space,
bounds,
child,
e.node->m_visibility,
e.node->m_time_from,
e.node->m_time_to,
e.node->visibility,
e.node->time_from,
e.node->time_to,
num);
}

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

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

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

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

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

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

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

@@ -15,26 +15,26 @@
* limitations under the License.
*/
#include "bvh_binning.h"
#include "bvh_build.h"
#include "bvh_node.h"
#include "bvh_params.h"
#include "bvh/bvh_binning.h"
#include "bvh/bvh_build.h"
#include "bvh/bvh_node.h"
#include "bvh/bvh_params.h"
#include "bvh_split.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "curves.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/curves.h"
#include "util_algorithm.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_progress.h"
#include "util_stack_allocator.h"
#include "util_simd.h"
#include "util_time.h"
#include "util_queue.h"
#include "util/util_algorithm.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_progress.h"
#include "util/util_stack_allocator.h"
#include "util/util_simd.h"
#include "util/util_time.h"
#include "util/util_queue.h"
CCL_NAMESPACE_BEGIN
@@ -866,8 +866,8 @@ BVHNode *BVHBuild::create_object_leaf_nodes(const BVHReference *ref, int start,
uint visibility = objects[ref->prim_object()]->visibility;
BVHNode *leaf_node = new LeafNode(ref->bounds(), visibility, start, start+1);
leaf_node->m_time_from = ref->time_from();
leaf_node->m_time_to = ref->time_to();
leaf_node->time_from = ref->time_from();
leaf_node->time_to = ref->time_to();
return leaf_node;
}
else {
@@ -876,12 +876,12 @@ BVHNode *BVHBuild::create_object_leaf_nodes(const BVHReference *ref, int start,
BVHNode *leaf1 = create_object_leaf_nodes(ref+mid, start+mid, num-mid);
BoundBox bounds = BoundBox::empty;
bounds.grow(leaf0->m_bounds);
bounds.grow(leaf1->m_bounds);
bounds.grow(leaf0->bounds);
bounds.grow(leaf1->bounds);
BVHNode *inner_node = new InnerNode(bounds, leaf0, leaf1);
inner_node->m_time_from = min(leaf0->m_time_from, leaf1->m_time_from);
inner_node->m_time_to = max(leaf0->m_time_to, leaf1->m_time_to);
inner_node->time_from = min(leaf0->time_from, leaf1->time_from);
inner_node->time_to = max(leaf0->time_to, leaf1->time_to);
return inner_node;
}
}
@@ -1004,19 +1004,19 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range,
time_from = min(time_from, ref.time_from());
time_to = max(time_to, ref.time_to());
}
leaf_node->m_time_from = time_from;
leaf_node->m_time_to = time_to;
leaf_node->time_from = time_from;
leaf_node->time_to = time_to;
}
if(alignment_found) {
/* Need to recalculate leaf bounds with new alignment. */
leaf_node->m_bounds = BoundBox::empty;
leaf_node->bounds = BoundBox::empty;
for(int j = 0; j < num; ++j) {
const BVHReference &ref = p_ref[i][j];
BoundBox ref_bounds =
unaligned_heuristic.compute_aligned_prim_boundbox(
ref,
aligned_space);
leaf_node->m_bounds.grow(ref_bounds);
leaf_node->bounds.grow(ref_bounds);
}
/* Set alignment space. */
leaf_node->set_aligned_space(aligned_space);
@@ -1099,8 +1099,8 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range,
*/
for(int i = 0; i < num_leaves; ++i) {
LeafNode *leaf = (LeafNode *)leaves[i];
leaf->m_lo += start_index;
leaf->m_hi += start_index;
leaf->lo += start_index;
leaf->hi += start_index;
}
/* Create leaf node for object. */
@@ -1129,17 +1129,17 @@ BVHNode* BVHBuild::create_leaf_node(const BVHRange& range,
return new InnerNode(range.bounds(), leaves[0], leaves[1]);
}
else if(num_leaves == 3) {
BoundBox inner_bounds = merge(leaves[1]->m_bounds, leaves[2]->m_bounds);
BoundBox inner_bounds = merge(leaves[1]->bounds, leaves[2]->bounds);
BVHNode *inner = new InnerNode(inner_bounds, leaves[1], leaves[2]);
return new InnerNode(range.bounds(), leaves[0], inner);
} else {
/* Should be doing more branches if more primitive types added. */
assert(num_leaves <= 5);
BoundBox inner_bounds_a = merge(leaves[0]->m_bounds, leaves[1]->m_bounds);
BoundBox inner_bounds_b = merge(leaves[2]->m_bounds, leaves[3]->m_bounds);
BoundBox inner_bounds_a = merge(leaves[0]->bounds, leaves[1]->bounds);
BoundBox inner_bounds_b = merge(leaves[2]->bounds, leaves[3]->bounds);
BVHNode *inner_a = new InnerNode(inner_bounds_a, leaves[0], leaves[1]);
BVHNode *inner_b = new InnerNode(inner_bounds_b, leaves[2], leaves[3]);
BoundBox inner_bounds_c = merge(inner_a->m_bounds, inner_b->m_bounds);
BoundBox inner_bounds_c = merge(inner_a->bounds, inner_b->bounds);
BVHNode *inner_c = new InnerNode(inner_bounds_c, inner_a, inner_b);
if(num_leaves == 5) {
return new InnerNode(range.bounds(), inner_c, leaves[4]);
@@ -1174,8 +1174,8 @@ void BVHBuild::rotate(BVHNode *node, int max_depth)
rotate(parent->children[c], max_depth-1);
/* compute current area of all children */
BoundBox bounds0 = parent->children[0]->m_bounds;
BoundBox bounds1 = parent->children[1]->m_bounds;
BoundBox bounds0 = parent->children[0]->bounds;
BoundBox bounds1 = parent->children[1]->bounds;
float area0 = bounds0.half_area();
float area1 = bounds1.half_area();
@@ -1195,8 +1195,8 @@ void BVHBuild::rotate(BVHNode *node, int max_depth)
BoundBox& other = (c == 0)? bounds1: bounds0;
/* transpose child bounds */
BoundBox target0 = child->children[0]->m_bounds;
BoundBox target1 = child->children[1]->m_bounds;
BoundBox target0 = child->children[0]->bounds;
BoundBox target1 = child->children[1]->bounds;
/* compute cost for both possible swaps */
float cost0 = merge(other, target1).half_area() - child_area[c];
@@ -1228,7 +1228,7 @@ void BVHBuild::rotate(BVHNode *node, int max_depth)
InnerNode *child = (InnerNode*)parent->children[best_child];
swap(parent->children[best_other], child->children[best_target]);
child->m_bounds = merge(child->children[0]->m_bounds, child->children[1]->m_bounds);
child->bounds = merge(child->children[0]->bounds, child->children[1]->bounds);
}
CCL_NAMESPACE_END

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

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

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

@@ -15,12 +15,12 @@
* limitations under the License.
*/
#include "bvh.h"
#include "bvh_build.h"
#include "bvh_node.h"
#include "bvh/bvh.h"
#include "bvh/bvh_build.h"
#include "bvh/bvh_node.h"
#include "util_debug.h"
#include "util_vector.h"
#include "util/util_debug.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN
@@ -62,12 +62,12 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
}
return cnt;
case BVH_STAT_ALIGNED_COUNT:
if(!is_unaligned()) {
if(!is_unaligned) {
cnt = 1;
}
break;
case BVH_STAT_UNALIGNED_COUNT:
if(is_unaligned()) {
if(is_unaligned) {
cnt = 1;
}
break;
@@ -75,7 +75,7 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
if(!is_leaf()) {
bool has_unaligned = false;
for(int j = 0; j < num_children(); j++) {
has_unaligned |= get_child(j)->is_unaligned();
has_unaligned |= get_child(j)->is_unaligned;
}
cnt += has_unaligned? 0: 1;
}
@@ -84,7 +84,7 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
if(!is_leaf()) {
bool has_unaligned = false;
for(int j = 0; j < num_children(); j++) {
has_unaligned |= get_child(j)->is_unaligned();
has_unaligned |= get_child(j)->is_unaligned;
}
cnt += has_unaligned? 1: 0;
}
@@ -95,12 +95,12 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
for(int i = 0; i < num_children(); i++) {
BVHNode *node = get_child(i);
if(node->is_leaf()) {
has_unaligned |= node->is_unaligned();
has_unaligned |= node->is_unaligned;
}
else {
for(int j = 0; j < node->num_children(); j++) {
cnt += node->get_child(j)->getSubtreeSize(stat);
has_unaligned |= node->get_child(j)->is_unaligned();
has_unaligned |= node->get_child(j)->is_unaligned;
}
}
}
@@ -113,12 +113,12 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
for(int i = 0; i < num_children(); i++) {
BVHNode *node = get_child(i);
if(node->is_leaf()) {
has_unaligned |= node->is_unaligned();
has_unaligned |= node->is_unaligned;
}
else {
for(int j = 0; j < node->num_children(); j++) {
cnt += node->get_child(j)->getSubtreeSize(stat);
has_unaligned |= node->get_child(j)->is_unaligned();
has_unaligned |= node->get_child(j)->is_unaligned;
}
}
}
@@ -126,10 +126,10 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
}
return cnt;
case BVH_STAT_ALIGNED_LEAF_COUNT:
cnt = (is_leaf() && !is_unaligned()) ? 1 : 0;
cnt = (is_leaf() && !is_unaligned) ? 1 : 0;
break;
case BVH_STAT_UNALIGNED_LEAF_COUNT:
cnt = (is_leaf() && is_unaligned()) ? 1 : 0;
cnt = (is_leaf() && is_unaligned) ? 1 : 0;
break;
default:
assert(0); /* unknown mode */
@@ -157,7 +157,7 @@ float BVHNode::computeSubtreeSAHCost(const BVHParams& p, float probability) cons
for(int i = 0; i < num_children(); i++) {
BVHNode *child = get_child(i);
SAH += child->computeSubtreeSAHCost(p, probability * child->m_bounds.safe_area()/m_bounds.safe_area());
SAH += child->computeSubtreeSAHCost(p, probability * child->bounds.safe_area()/bounds.safe_area());
}
return SAH;
@@ -165,15 +165,15 @@ float BVHNode::computeSubtreeSAHCost(const BVHParams& p, float probability) cons
uint BVHNode::update_visibility()
{
if(!is_leaf() && m_visibility == 0) {
if(!is_leaf() && visibility == 0) {
InnerNode *inner = (InnerNode*)this;
BVHNode *child0 = inner->children[0];
BVHNode *child1 = inner->children[1];
m_visibility = child0->update_visibility()|child1->update_visibility();
visibility = child0->update_visibility()|child1->update_visibility();
}
return m_visibility;
return visibility;
}
void BVHNode::update_time()
@@ -184,8 +184,8 @@ void BVHNode::update_time()
BVHNode *child1 = inner->children[1];
child0->update_time();
child1->update_time();
m_time_from = min(child0->m_time_from, child1->m_time_from);
m_time_to = max(child0->m_time_to, child1->m_time_to);
time_from = min(child0->time_from, child1->time_from);
time_to = max(child0->time_to, child1->time_to);
}
}
@@ -209,7 +209,7 @@ void LeafNode::print(int depth) const
for(int i = 0; i < depth; i++)
printf(" ");
printf("leaf node %d to %d\n", m_lo, m_hi);
printf("leaf node %d to %d\n", lo, hi);
}
CCL_NAMESPACE_END

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

@@ -18,9 +18,9 @@
#ifndef __BVH_NODE_H__
#define __BVH_NODE_H__
#include "util_boundbox.h"
#include "util_debug.h"
#include "util_types.h"
#include "util/util_boundbox.h"
#include "util/util_debug.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN
@@ -46,16 +46,16 @@ class BVHParams;
class BVHNode
{
public:
BVHNode() : m_is_unaligned(false),
m_aligned_space(NULL),
m_time_from(0.0f),
m_time_to(1.0f)
BVHNode() : is_unaligned(false),
aligned_space(NULL),
time_from(0.0f),
time_to(1.0f)
{
}
virtual ~BVHNode()
{
delete m_aligned_space;
delete aligned_space;
}
virtual bool is_leaf() const = 0;
@@ -63,30 +63,26 @@ public:
virtual BVHNode *get_child(int i) const = 0;
virtual int num_triangles() const { return 0; }
virtual void print(int depth = 0) const = 0;
bool is_unaligned() const { return m_is_unaligned; }
inline void set_aligned_space(const Transform& aligned_space)
{
m_is_unaligned = true;
if(m_aligned_space == NULL) {
m_aligned_space = new Transform(aligned_space);
is_unaligned = true;
if(this->aligned_space == NULL) {
this->aligned_space = new Transform(aligned_space);
}
else {
*m_aligned_space = aligned_space;
*this->aligned_space = aligned_space;
}
}
inline Transform get_aligned_space() const
{
if(m_aligned_space == NULL) {
if(aligned_space == NULL) {
return transform_identity();
}
return *m_aligned_space;
return *aligned_space;
}
BoundBox m_bounds;
uint m_visibility;
// Subtree functions
int getSubtreeSize(BVH_STAT stat=BVH_STAT_NODE_COUNT) const;
float computeSubtreeSAHCost(const BVHParams& p, float probability = 1.0f) const;
@@ -95,13 +91,18 @@ public:
uint update_visibility();
void update_time();
bool m_is_unaligned;
// Properties.
BoundBox bounds;
uint visibility;
// TODO(sergey): Can be stored as 3x3 matrix, but better to have some
// utilities and type defines in util_transform first.
Transform *m_aligned_space;
bool is_unaligned;
float m_time_from, m_time_to;
/* TODO(sergey): Can be stored as 3x3 matrix, but better to have some
* utilities and type defines in util_transform first.
*/
Transform *aligned_space;
float time_from, time_to;
};
class InnerNode : public BVHNode
@@ -111,20 +112,20 @@ public:
BVHNode* child0,
BVHNode* child1)
{
m_bounds = bounds;
this->bounds = bounds;
children[0] = child0;
children[1] = child1;
if(child0 && child1)
m_visibility = child0->m_visibility|child1->m_visibility;
visibility = child0->visibility|child1->visibility;
else
m_visibility = 0; /* happens on build cancel */
visibility = 0; /* happens on build cancel */
}
explicit InnerNode(const BoundBox& bounds)
{
m_bounds = bounds;
m_visibility = 0;
this->bounds = bounds;
visibility = 0;
children[0] = NULL;
children[1] = NULL;
}
@@ -140,12 +141,12 @@ public:
class LeafNode : public BVHNode
{
public:
LeafNode(const BoundBox& bounds, uint visibility, int lo, int hi)
LeafNode(const BoundBox& bounds, uint visibility, int lo, int hi)
: lo(lo),
hi(hi)
{
m_bounds = bounds;
m_visibility = visibility;
m_lo = lo;
m_hi = hi;
this->bounds = bounds;
this->visibility = visibility;
}
LeafNode(const LeafNode& s)
@@ -157,14 +158,13 @@ public:
bool is_leaf() const { return true; }
int num_children() const { return 0; }
BVHNode *get_child(int) const { return NULL; }
int num_triangles() const { return m_hi - m_lo; }
int num_triangles() const { return hi - lo; }
void print(int depth) const;
int m_lo;
int m_hi;
int lo;
int hi;
};
CCL_NAMESPACE_END
#endif /* __BVH_NODE_H__ */

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

@@ -18,9 +18,9 @@
#ifndef __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

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

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

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

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

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

@@ -18,8 +18,8 @@
#ifndef __BVH_SPLIT_H__
#define __BVH_SPLIT_H__
#include "bvh_build.h"
#include "bvh_params.h"
#include "bvh/bvh_build.h"
#include "bvh/bvh_params.h"
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 "object.h"
#include "render/mesh.h"
#include "render/object.h"
#include "bvh_binning.h"
#include "bvh/bvh_binning.h"
#include "bvh_params.h"
#include "util_boundbox.h"
#include "util_debug.h"
#include "util_transform.h"
#include "util/util_boundbox.h"
#include "util/util_debug.h"
#include "util/util_transform.h"
CCL_NAMESPACE_BEGIN

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

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

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

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

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

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

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

@@ -19,15 +19,15 @@
#include <stdlib.h>
#include "device_memory.h"
#include "device_task.h"
#include "device/device_memory.h"
#include "device/device_task.h"
#include "util_list.h"
#include "util_stats.h"
#include "util_string.h"
#include "util_thread.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_list.h"
#include "util/util_stats.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_types.h"
#include "util/util_vector.h"
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. */
#ifdef WITH_OSL
/* So no context pollution happens from indirectly included windows.h */
# include "util_windows.h"
# include "util/util_windows.h"
# include <OSL/oslexec.h>
#endif
#include "device.h"
#include "device_intern.h"
#include "device_split_kernel.h"
#include "device/device.h"
#include "device/device_intern.h"
#include "device/device_split_kernel.h"
#include "kernel.h"
#include "kernel_compat_cpu.h"
#include "kernel_types.h"
#include "split/kernel_split_data.h"
#include "kernel_globals.h"
#include "kernel/kernel.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/kernel_types.h"
#include "kernel/split/kernel_split_data.h"
#include "kernel/kernel_globals.h"
#include "osl_shader.h"
#include "osl_globals.h"
#include "kernel/osl/osl_shader.h"
#include "kernel/osl/osl_globals.h"
#include "buffers.h"
#include "render/buffers.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_function.h"
#include "util_logging.h"
#include "util_map.h"
#include "util_opengl.h"
#include "util_progress.h"
#include "util_system.h"
#include "util_thread.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_function.h"
#include "util/util_logging.h"
#include "util/util_map.h"
#include "util/util_opengl.h"
#include "util/util_progress.h"
#include "util/util_system.h"
#include "util/util_thread.h"
CCL_NAMESPACE_BEGIN

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

@@ -20,31 +20,31 @@
#include <stdlib.h>
#include <string.h>
#include "device.h"
#include "device_intern.h"
#include "device_split_kernel.h"
#include "device/device.h"
#include "device/device_intern.h"
#include "device/device_split_kernel.h"
#include "buffers.h"
#include "render/buffers.h"
#ifdef WITH_CUDA_DYNLOAD
# include "cuew.h"
#else
# include "util_opengl.h"
# include "util/util_opengl.h"
# include <cuda.h>
# include <cudaGL.h>
#endif
#include "util_debug.h"
#include "util_logging.h"
#include "util_map.h"
#include "util_md5.h"
#include "util_opengl.h"
#include "util_path.h"
#include "util_string.h"
#include "util_system.h"
#include "util_types.h"
#include "util_time.h"
#include "util/util_debug.h"
#include "util/util_logging.h"
#include "util/util_map.h"
#include "util/util_md5.h"
#include "util/util_opengl.h"
#include "util/util_path.h"
#include "util/util_string.h"
#include "util/util_system.h"
#include "util/util_types.h"
#include "util/util_time.h"
#include "split/kernel_split_data_types.h"
#include "kernel/split/kernel_split_data_types.h"
CCL_NAMESPACE_BEGIN
@@ -300,8 +300,8 @@ public:
{
const int cuda_version = cuewCompilerVersion();
const int machine = system_cpu_bits();
const string kernel_path = path_get("kernel");
const string include = kernel_path;
const string kernel_path = path_get("source/kernel");
const string include = path_dirname(kernel_path);
string cflags = string_printf("-m%d "
"--ptxas-options=\"-v\" "
"--use_fast_math "
@@ -345,15 +345,15 @@ public:
cuda_error_message("CUDA nvcc compiler version could not be parsed.");
return false;
}
if(cuda_version < 75) {
if(cuda_version < 80) {
printf("Unsupported CUDA version %d.%d detected, "
"you need CUDA 7.5 or newer.\n",
"you need CUDA 8.0 or newer.\n",
major, minor);
return false;
}
else if(cuda_version != 75 && cuda_version != 80) {
else if(cuda_version != 80) {
printf("CUDA version %d.%d detected, build may succeed but only "
"CUDA 7.5 and 8.0 are officially supported.\n",
"CUDA 8.0 is officially supported.\n",
major, minor);
}
return true;
@@ -382,7 +382,7 @@ public:
compile_kernel_get_common_cflags(requested_features, split);
/* 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);
/* 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
* to and from. */
#include "util_debug.h"
#include "util_half.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_debug.h"
#include "util/util_half.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

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

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

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

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

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

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

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

@@ -16,12 +16,12 @@
#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_logging.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
CCL_NAMESPACE_BEGIN

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

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

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

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

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

@@ -17,12 +17,12 @@
#include <stdlib.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_time.h"
#include "util/util_algorithm.h"
#include "util/util_time.h"
CCL_NAMESPACE_BEGIN

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

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

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

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

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

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

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

@@ -16,15 +16,15 @@
#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_path.h"
#include "util_time.h"
#include "util/util_md5.h"
#include "util/util_path.h"
#include "util/util_time.h"
CCL_NAMESPACE_BEGIN
@@ -84,7 +84,7 @@ public:
#define KERNEL_TEX(type, ttype, name) \
set_kernel_arg_mem(ckPathTraceKernel, &start_arg_index, #name);
#include "kernel_textures.h"
#include "kernel/kernel_textures.h"
#undef KERNEL_TEX
start_arg_index += kernel_set_args(ckPathTraceKernel,

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

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

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

@@ -16,12 +16,12 @@
#ifdef WITH_OPENCL
#include "opencl.h"
#include "device/opencl/opencl.h"
#include "util_logging.h"
#include "util_md5.h"
#include "util_path.h"
#include "util_time.h"
#include "util/util_logging.h"
#include "util/util_md5.h"
#include "util/util_path.h"
#include "util/util_time.h"
using std::cerr;
using std::endl;
@@ -235,7 +235,7 @@ string OpenCLCache::get_kernel_md5()
thread_scoped_lock lock(self.kernel_md5_lock);
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;
}
@@ -339,12 +339,12 @@ bool OpenCLDeviceBase::OpenCLProgram::build_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
* 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.
*/
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";
if(debug_src) {
@@ -444,7 +444,7 @@ void OpenCLDeviceBase::OpenCLProgram::load()
/* need to create source to get md5 */
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);
basename = path_cache_get(path_join("kernels", basename));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,7 @@
remove_extra_strict_flags()
set(INC
.
../util
osl
svm
..
)
set(INC_SYS
@@ -309,8 +306,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
${cuda_math_flags}
${cuda_extra_flags}
${cuda_debug_flags}
-I${CMAKE_CURRENT_SOURCE_DIR}/../util
-I${CMAKE_CURRENT_SOURCE_DIR}/svm
-I${CMAKE_CURRENT_SOURCE_DIR}/..
-DCCL_NAMESPACE_BEGIN=
-DCCL_NAMESPACE_END=
-DNVCC
@@ -413,33 +409,33 @@ endif()
#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} "kernels/opencl/kernel.cl" ${CYCLES_INSTALL_PATH}/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_split.cl" ${CYCLES_INSTALL_PATH}/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_path_init.cl" ${CYCLES_INSTALL_PATH}/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_scene_intersect.cl" ${CYCLES_INSTALL_PATH}/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_do_volume.cl" ${CYCLES_INSTALL_PATH}/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_shader_eval.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}/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_direct_lighting.cl" ${CYCLES_INSTALL_PATH}/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_dl.cl" ${CYCLES_INSTALL_PATH}/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_indirect_subsurface.cl" ${CYCLES_INSTALL_PATH}/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/cuda/kernel.cu" ${CYCLES_INSTALL_PATH}/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} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_KERNELS_CUDA_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/kernels/cuda)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_BVH_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/bvh)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CLOSURE_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/closure)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/svm)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_GEOM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/geom)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel)
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SPLIT_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/split)
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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/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}/source/kernel)
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}/source/kernel/bvh)
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}/source/kernel/svm)
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}/source/util)
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
#include "bvh_types.h"
#include "kernel/bvh/bvh_types.h"
/* Common QBVH functions. */
#ifdef __QBVH__
# include "qbvh_nodes.h"
# include "kernel/bvh/qbvh_nodes.h"
#endif
/* Regular BVH traversal */
#include "bvh_nodes.h"
#include "kernel/bvh/bvh_nodes.h"
#define BVH_FUNCTION_NAME bvh_intersect
#define BVH_FUNCTION_FEATURES 0
#include "bvh_traversal.h"
#include "kernel/bvh/bvh_traversal.h"
#if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING
# include "bvh_traversal.h"
# include "kernel/bvh/bvh_traversal.h"
#endif
#if defined(__HAIR__)
# define BVH_FUNCTION_NAME bvh_intersect_hair
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH
# include "bvh_traversal.h"
# include "kernel/bvh/bvh_traversal.h"
#endif
#if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION
# include "bvh_traversal.h"
# include "kernel/bvh/bvh_traversal.h"
#endif
#if defined(__HAIR__) && defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_hair_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
/* Subsurface scattering BVH traversal */
@@ -71,12 +71,12 @@ CCL_NAMESPACE_BEGIN
#if defined(__SUBSURFACE__)
# define BVH_FUNCTION_NAME bvh_intersect_subsurface
# define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_subsurface.h"
# include "kernel/bvh/bvh_subsurface.h"
# if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_subsurface_motion
# define BVH_FUNCTION_FEATURES BVH_MOTION|BVH_HAIR
# include "bvh_subsurface.h"
# include "kernel/bvh/bvh_subsurface.h"
# endif
#endif /* __SUBSURFACE__ */
@@ -85,18 +85,18 @@ CCL_NAMESPACE_BEGIN
#if defined(__VOLUME__)
# define BVH_FUNCTION_NAME bvh_intersect_volume
# define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_volume.h"
# include "kernel/bvh/bvh_volume.h"
# if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_volume.h"
# include "kernel/bvh/bvh_volume.h"
# endif
# if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR
# include "bvh_volume.h"
# include "kernel/bvh/bvh_volume.h"
# endif
#endif /* __VOLUME__ */
@@ -105,30 +105,30 @@ CCL_NAMESPACE_BEGIN
#if defined(__SHADOW_RECORD_ALL__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all
# define BVH_FUNCTION_FEATURES 0
# include "bvh_shadow_all.h"
# include "kernel/bvh/bvh_shadow_all.h"
# if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING
# include "bvh_shadow_all.h"
# include "kernel/bvh/bvh_shadow_all.h"
# endif
# if defined(__HAIR__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_shadow_all.h"
# include "kernel/bvh/bvh_shadow_all.h"
# endif
# if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION
# include "bvh_shadow_all.h"
# include "kernel/bvh/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_INSTANCING|BVH_HAIR|BVH_MOTION
# include "bvh_shadow_all.h"
# include "kernel/bvh/bvh_shadow_all.h"
# endif
#endif /* __SHADOW_RECORD_ALL__ */
@@ -137,18 +137,18 @@ CCL_NAMESPACE_BEGIN
#if defined(__VOLUME_RECORD_ALL__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all
# define BVH_FUNCTION_FEATURES BVH_HAIR
# include "bvh_volume_all.h"
# include "kernel/bvh/bvh_volume_all.h"
# if defined(__INSTANCING__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all_instancing
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
# include "bvh_volume_all.h"
# include "kernel/bvh/bvh_volume_all.h"
# endif
# if defined(__OBJECT_MOTION__)
# define BVH_FUNCTION_NAME bvh_intersect_volume_all_motion
# define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION|BVH_HAIR
# include "bvh_volume_all.h"
# include "kernel/bvh/bvh_volume_all.h"
# endif
#endif /* __VOLUME_RECORD_ALL__ */

174
intern/cycles/kernel/bvh/bvh_nodes.h
View File

@@ -17,8 +17,8 @@
// TODO(sergey): Look into avoid use of full Transform and use 3x3 matrix and
// 3-vector which might be faster.
ccl_device_forceinline Transform bvh_unaligned_node_fetch_space(KernelGlobals *kg,
int node_addr,
int child)
int node_addr,
int child)
{
Transform space;
const int child_addr = node_addr + child * 3;
@@ -31,12 +31,12 @@ ccl_device_forceinline Transform bvh_unaligned_node_fetch_space(KernelGlobals *k
#if !defined(__KERNEL_SSE2__)
ccl_device_forceinline int bvh_aligned_node_intersect(KernelGlobals *kg,
const float3 P,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
{
/* fetch node data */
@@ -78,14 +78,14 @@ ccl_device_forceinline int bvh_aligned_node_intersect(KernelGlobals *kg,
}
ccl_device_forceinline int bvh_aligned_node_intersect_robust(KernelGlobals *kg,
const float3 P,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
{
/* fetch node data */
@@ -203,13 +203,13 @@ ccl_device_forceinline bool bvh_unaligned_node_intersect_child_robust(
}
ccl_device_forceinline int bvh_unaligned_node_intersect(KernelGlobals *kg,
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
{
int mask = 0;
float4 cnodes = kernel_tex_fetch(__bvh_nodes, node_addr+0);
@@ -233,15 +233,15 @@ ccl_device_forceinline int bvh_unaligned_node_intersect(KernelGlobals *kg,
}
ccl_device_forceinline int bvh_unaligned_node_intersect_robust(KernelGlobals *kg,
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
{
int mask = 0;
float4 cnodes = kernel_tex_fetch(__bvh_nodes, node_addr+0);
@@ -265,13 +265,13 @@ ccl_device_forceinline int bvh_unaligned_node_intersect_robust(KernelGlobals *kg
}
ccl_device_forceinline int bvh_node_intersect(KernelGlobals *kg,
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const int node_addr,
const uint visibility,
float dist[2])
{
float4 node = kernel_tex_fetch(__bvh_nodes, node_addr);
if(__float_as_uint(node.x) & PATH_RAY_NODE_UNALIGNED) {
@@ -296,15 +296,15 @@ ccl_device_forceinline int bvh_node_intersect(KernelGlobals *kg,
}
ccl_device_forceinline int bvh_node_intersect_robust(KernelGlobals *kg,
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const float3 idir,
const float t,
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
{
float4 node = kernel_tex_fetch(__bvh_nodes, node_addr);
if(__float_as_uint(node.x) & PATH_RAY_NODE_UNALIGNED) {
@@ -442,13 +442,13 @@ ccl_device_forceinline int bvh_aligned_node_intersect_robust(
}
ccl_device_forceinline int bvh_unaligned_node_intersect(KernelGlobals *kg,
const float3 P,
const float3 dir,
const ssef& isect_near,
const ssef& isect_far,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const ssef& isect_near,
const ssef& isect_far,
const int node_addr,
const uint visibility,
float dist[2])
{
Transform space0 = bvh_unaligned_node_fetch_space(kg, node_addr, 0);
Transform space1 = bvh_unaligned_node_fetch_space(kg, node_addr, 1);
@@ -503,14 +503,14 @@ ccl_device_forceinline int bvh_unaligned_node_intersect(KernelGlobals *kg,
}
ccl_device_forceinline int bvh_unaligned_node_intersect_robust(KernelGlobals *kg,
const float3 P,
const float3 dir,
const ssef& isect_near,
const ssef& isect_far,
const float difl,
const int node_addr,
const uint visibility,
float dist[2])
const float3 P,
const float3 dir,
const ssef& isect_near,
const ssef& isect_far,
const float difl,
const int node_addr,
const uint visibility,
float dist[2])
{
Transform space0 = bvh_unaligned_node_fetch_space(kg, node_addr, 0);
Transform space1 = bvh_unaligned_node_fetch_space(kg, node_addr, 1);
@@ -574,17 +574,17 @@ ccl_device_forceinline int bvh_unaligned_node_intersect_robust(KernelGlobals *kg
}
ccl_device_forceinline int bvh_node_intersect(KernelGlobals *kg,
const float3& P,
const float3& dir,
const ssef& isect_near,
const ssef& isect_far,
const ssef& tsplat,
const ssef Psplat[3],
const ssef idirsplat[3],
const shuffle_swap_t shufflexyz[3],
const int node_addr,
const uint visibility,
float dist[2])
const float3& P,
const float3& dir,
const ssef& isect_near,
const ssef& isect_far,
const ssef& tsplat,
const ssef Psplat[3],
const ssef idirsplat[3],
const shuffle_swap_t shufflexyz[3],
const int node_addr,
const uint visibility,
float dist[2])
{
float4 node = kernel_tex_fetch(__bvh_nodes, node_addr);
if(__float_as_uint(node.x) & PATH_RAY_NODE_UNALIGNED) {
@@ -612,19 +612,19 @@ ccl_device_forceinline int bvh_node_intersect(KernelGlobals *kg,
}
ccl_device_forceinline int bvh_node_intersect_robust(KernelGlobals *kg,
const float3& P,
const float3& dir,
const ssef& isect_near,
const ssef& isect_far,
const ssef& tsplat,
const ssef Psplat[3],
const ssef idirsplat[3],
const shuffle_swap_t shufflexyz[3],
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
const float3& P,
const float3& dir,
const ssef& isect_near,
const ssef& isect_far,
const ssef& tsplat,
const ssef Psplat[3],
const ssef idirsplat[3],
const shuffle_swap_t shufflexyz[3],
const float difl,
const float extmax,
const int node_addr,
const uint visibility,
float dist[2])
{
float4 node = kernel_tex_fetch(__bvh_nodes, node_addr);
if(__float_as_uint(node.x) & PATH_RAY_NODE_UNALIGNED) {

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

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

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

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

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

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

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

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

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

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

1
intern/cycles/kernel/bvh/qbvh_shadow_all.h
View File

@@ -103,6 +103,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
/* Traverse internal nodes. */
while(node_addr >= 0 && node_addr != ENTRYPOINT_SENTINEL) {
float4 inodes = kernel_tex_fetch(__bvh_nodes, node_addr+0);
(void)inodes;
if(false
#ifdef __VISIBILITY_FLAG__

4
intern/cycles/kernel/bvh/qbvh_traversal.h
View File

@@ -112,6 +112,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
/* Traverse internal nodes. */
while(node_addr >= 0 && node_addr != ENTRYPOINT_SENTINEL) {
float4 inodes = kernel_tex_fetch(__bvh_nodes, node_addr+0);
(void)inodes;
if(UNLIKELY(node_dist > isect->t)
#if BVH_FEATURE(BVH_MOTION)
@@ -119,8 +120,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
|| UNLIKELY(ray->time > inodes.z)
#endif
#ifdef __VISIBILITY_FLAG__
|| (__float_as_uint(inodes.x) & visibility) == 0)
|| (__float_as_uint(inodes.x) & visibility) == 0
#endif
)
{
/* Pop. */
node_addr = traversal_stack[stack_ptr].addr;

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

@@ -14,37 +14,37 @@
* limitations under the License.
*/
#include "../closure/bsdf_ashikhmin_velvet.h"
#include "../closure/bsdf_diffuse.h"
#include "../closure/bsdf_oren_nayar.h"
#include "../closure/bsdf_phong_ramp.h"
#include "../closure/bsdf_diffuse_ramp.h"
#include "../closure/bsdf_microfacet.h"
#include "../closure/bsdf_microfacet_multi.h"
#include "../closure/bsdf_reflection.h"
#include "../closure/bsdf_refraction.h"
#include "../closure/bsdf_transparent.h"
#include "../closure/bsdf_ashikhmin_shirley.h"
#include "../closure/bsdf_toon.h"
#include "../closure/bsdf_hair.h"
#include "kernel/closure/bsdf_ashikhmin_velvet.h"
#include "kernel/closure/bsdf_diffuse.h"
#include "kernel/closure/bsdf_oren_nayar.h"
#include "kernel/closure/bsdf_phong_ramp.h"
#include "kernel/closure/bsdf_diffuse_ramp.h"
#include "kernel/closure/bsdf_microfacet.h"
#include "kernel/closure/bsdf_microfacet_multi.h"
#include "kernel/closure/bsdf_reflection.h"
#include "kernel/closure/bsdf_refraction.h"
#include "kernel/closure/bsdf_transparent.h"
#include "kernel/closure/bsdf_ashikhmin_shirley.h"
#include "kernel/closure/bsdf_toon.h"
#include "kernel/closure/bsdf_hair.h"
#ifdef __SUBSURFACE__
# include "../closure/bssrdf.h"
# include "kernel/closure/bssrdf.h"
#endif
#ifdef __VOLUME__
# include "../closure/volume.h"
# include "kernel/closure/volume.h"
#endif
CCL_NAMESPACE_BEGIN
ccl_device_forceinline int bsdf_sample(KernelGlobals *kg,
ShaderData *sd,
const ShaderClosure *sc,
float randu,
float randv,
float3 *eval,
float3 *omega_in,
differential3 *domega_in,
float *pdf)
ShaderData *sd,
const ShaderClosure *sc,
float randu,
float randv,
float3 *eval,
float3 *omega_in,
differential3 *domega_in,
float *pdf)
{
int label;

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_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. */
#if 0
#define MF_PHASE_FUNCTION diffuse
#define MF_MULTI_DIFFUSE
#include "bsdf_microfacet_multi_impl.h"
#include "kernel/closure/bsdf_microfacet_multi_impl.h"
#endif
#define MF_PHASE_FUNCTION 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)
{

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

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

12
intern/cycles/kernel/geom/geom_curve.h
View File

@@ -22,6 +22,12 @@ CCL_NAMESPACE_BEGIN
#ifdef __HAIR__
#if defined(__KERNEL_CUDA__) && (__CUDA_ARCH__ < 300)
# define ccl_device_curveintersect ccl_device
#else
# define ccl_device_curveintersect ccl_device_forceinline
#endif
/* Reading attributes on various curve elements */
ccl_device float curve_attribute_float(KernelGlobals *kg, const ShaderData *sd, const AttributeDescriptor desc, float *dx, float *dy)
@@ -222,10 +228,10 @@ ccl_device_inline ssef transform_point_T3(const ssef t[3], const ssef &a)
#ifdef __KERNEL_SSE2__
/* Pass P and dir by reference to aligned vector */
ccl_device_forceinline bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersection *isect,
ccl_device_curveintersect bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersection *isect,
const float3 &P, const float3 &dir, uint visibility, int object, int curveAddr, float time, int type, uint *lcg_state, float difl, float extmax)
#else
ccl_device_forceinline bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersection *isect,
ccl_device_curveintersect bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersection *isect,
float3 P, float3 dir, uint visibility, int object, int curveAddr, float time,int type, uint *lcg_state, float difl, float extmax)
#endif
{
@@ -688,7 +694,7 @@ ccl_device_forceinline bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Inte
return hit;
}
ccl_device_forceinline bool bvh_curve_intersect(KernelGlobals *kg, Intersection *isect,
ccl_device_curveintersect bool bvh_curve_intersect(KernelGlobals *kg, Intersection *isect,
float3 P, float3 direction, uint visibility, int object, int curveAddr, float time, int type, uint *lcg_state, float difl, float extmax)
{
/* define few macros to minimize code duplication for SSE */

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

@@ -19,8 +19,8 @@
/* CPU Kernel Interface */
#include "util_types.h"
#include "kernel_types.h"
#include "util/util_types.h"
#include "kernel/kernel_types.h"
CCL_NAMESPACE_BEGIN
@@ -48,31 +48,31 @@ void kernel_tex_copy(KernelGlobals *kg,
ExtensionType extension = EXTENSION_REPEAT);
#define KERNEL_ARCH cpu
#include "kernels/cpu/kernel_cpu.h"
#include "kernel/kernels/cpu/kernel_cpu.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_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 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_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 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_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 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_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 */
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_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 */
CCL_NAMESPACE_END

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

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

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

@@ -38,7 +38,7 @@
#define ccl_device __device__ __inline__
# define ccl_device_forceinline __device__ __forceinline__
#if (__KERNEL_CUDA_VERSION__ == 80) && (__CUDA_ARCH__ < 500)
#if __CUDA_ARCH__ < 500
# define ccl_device_inline __device__ __forceinline__
#else
# define ccl_device_inline __device__ __inline__
@@ -60,8 +60,8 @@
/* Types */
#include "util_half.h"
#include "util_types.h"
#include "util/util_half.h"
#include "util/util_types.h"
/* Work item functions */

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

@@ -143,8 +143,8 @@
/* define NULL */
#define NULL 0
#include "util_half.h"
#include "util_types.h"
#include "util/util_half.h"
#include "util/util_types.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_IMAGE_TEX(type, ttype, name)
# include "kernel_textures.h"
# include "kernel/kernel_textures.h"
KernelData __data;
@@ -97,7 +97,7 @@ typedef struct KernelGlobals {
# define KERNEL_TEX(type, ttype, name) const __constant__ __device__ type *name;
# endif
# define KERNEL_IMAGE_TEX(type, ttype, name) ttype name;
# include "kernel_textures.h"
# include "kernel/kernel_textures.h"
#endif /* __KERNEL_CUDA__ */
@@ -110,7 +110,7 @@ typedef ccl_addr_space struct KernelGlobals {
# define KERNEL_TEX(type, ttype, name) \
ccl_global type *name;
# include "kernel_textures.h"
# include "kernel/kernel_textures.h"
# ifdef __SPLIT_KERNEL__
SplitData split_data;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -29,10 +29,10 @@
# define __KERNEL_AVX2__
#endif
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx2
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#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.
*/
#include "kernel_compat_cpu.h"
#include "kernel/kernel_compat_cpu.h"
#ifndef __SPLIT_KERNEL__
# include "kernel_math.h"
# include "kernel_types.h"
# include "kernel/kernel_math.h"
# include "kernel/kernel_types.h"
# include "split/kernel_split_data.h"
# include "kernel_globals.h"
# include "kernel/split/kernel_split_data.h"
# include "kernel/kernel_globals.h"
# include "kernel_cpu_image.h"
# include "kernel_film.h"
# include "kernel_path.h"
# include "kernel_path_branched.h"
# include "kernel_bake.h"
# include "kernel/kernels/cpu/kernel_cpu_image.h"
# include "kernel/kernel_film.h"
# include "kernel/kernel_path.h"
# include "kernel/kernel_path_branched.h"
# include "kernel/kernel_bake.h"
#else
# include "split/kernel_split_common.h"
# include "kernel/split/kernel_split_common.h"
# include "split/kernel_data_init.h"
# include "split/kernel_path_init.h"
# include "split/kernel_scene_intersect.h"
# include "split/kernel_lamp_emission.h"
# include "split/kernel_do_volume.h"
# include "split/kernel_queue_enqueue.h"
# include "split/kernel_indirect_background.h"
# include "split/kernel_shader_eval.h"
# include "split/kernel_holdout_emission_blurring_pathtermination_ao.h"
# include "split/kernel_subsurface_scatter.h"
# include "split/kernel_direct_lighting.h"
# include "split/kernel_shadow_blocked_ao.h"
# include "split/kernel_shadow_blocked_dl.h"
# include "split/kernel_next_iteration_setup.h"
# include "split/kernel_indirect_subsurface.h"
# include "split/kernel_buffer_update.h"
# include "kernel/split/kernel_data_init.h"
# include "kernel/split/kernel_path_init.h"
# include "kernel/split/kernel_scene_intersect.h"
# include "kernel/split/kernel_lamp_emission.h"
# include "kernel/split/kernel_do_volume.h"
# include "kernel/split/kernel_queue_enqueue.h"
# include "kernel/split/kernel_indirect_background.h"
# include "kernel/split/kernel_shader_eval.h"
# include "kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h"
# include "kernel/split/kernel_subsurface_scatter.h"
# include "kernel/split/kernel_direct_lighting.h"
# include "kernel/split/kernel_shadow_blocked_ao.h"
# include "kernel/split/kernel_shadow_blocked_dl.h"
# include "kernel/split/kernel_next_iteration_setup.h"
# include "kernel/split/kernel_indirect_subsurface.h"
# include "kernel/split/kernel_buffer_update.h"
#endif
CCL_NAMESPACE_BEGIN

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

@@ -57,7 +57,7 @@
/* do nothing */
#endif
#include "kernel.h"
#include "kernel/kernel.h"
#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__
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#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__
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_avx2
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#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__
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse2
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#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__
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse3
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#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__
#include "util_optimization.h"
#include "util/util_optimization.h"
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
# include "kernel.h"
# include "kernel/kernel.h"
# define KERNEL_ARCH cpu_sse41
# include "kernel_cpu_impl.h"
# include "kernel/kernels/cpu/kernel_cpu_impl.h"
#endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

34
intern/cycles/kernel/kernels/opencl/kernel_split.cl
View File

@@ -14,22 +14,22 @@
* limitations under the License.
*/
#include "kernel_state_buffer_size.cl"
#include "kernel_data_init.cl"
#include "kernel_path_init.cl"
#include "kernel/kernels/opencl/kernel_state_buffer_size.cl"
#include "kernel/kernels/opencl/kernel_data_init.cl"
#include "kernel/kernels/opencl/kernel_path_init.cl"
#include "kernel_scene_intersect.cl"
#include "kernel_lamp_emission.cl"
#include "kernel_do_volume.cl"
#include "kernel_indirect_background.cl"
#include "kernel_queue_enqueue.cl"
#include "kernel_shader_eval.cl"
#include "kernel_holdout_emission_blurring_pathtermination_ao.cl"
#include "kernel_subsurface_scatter.cl"
#include "kernel_direct_lighting.cl"
#include "kernel_shadow_blocked_ao.cl"
#include "kernel_shadow_blocked_dl.cl"
#include "kernel_next_iteration_setup.cl"
#include "kernel_indirect_subsurface.cl"
#include "kernel_buffer_update.cl"
#include "kernel/kernels/opencl/kernel_scene_intersect.cl"
#include "kernel/kernels/opencl/kernel_lamp_emission.cl"
#include "kernel/kernels/opencl/kernel_do_volume.cl"
#include "kernel/kernels/opencl/kernel_indirect_background.cl"
#include "kernel/kernels/opencl/kernel_queue_enqueue.cl"
#include "kernel/kernels/opencl/kernel_shader_eval.cl"
#include "kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl"
#include "kernel/kernels/opencl/kernel_subsurface_scatter.cl"
#include "kernel/kernels/opencl/kernel_direct_lighting.cl"
#include "kernel/kernels/opencl/kernel_shadow_blocked_ao.cl"
#include "kernel/kernels/opencl/kernel_shadow_blocked_dl.cl"
#include "kernel/kernels/opencl/kernel_next_iteration_setup.cl"
#include "kernel/kernels/opencl/kernel_indirect_subsurface.cl"
#include "kernel/kernels/opencl/kernel_buffer_update.cl"

4
intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl
View File

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

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

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

8
intern/cycles/kernel/osl/CMakeLists.txt
View File

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

6
intern/cycles/kernel/osl/background.cpp
View File

@@ -34,10 +34,10 @@
#include <OSL/genclosure.h>
#include "osl_closures.h"
#include "kernel/osl/osl_closures.h"
#include "kernel_compat_cpu.h"
#include "closure/alloc.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/closure/alloc.h"
CCL_NAMESPACE_BEGIN

12
intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
View File

@@ -34,13 +34,13 @@
#include <OSL/genclosure.h>
#include "kernel_compat_cpu.h"
#include "osl_closures.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/osl/osl_closures.h"
#include "kernel_types.h"
#include "kernel_montecarlo.h"
#include "closure/alloc.h"
#include "closure/bsdf_diffuse_ramp.h"
#include "kernel/kernel_types.h"
#include "kernel/kernel_montecarlo.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_diffuse_ramp.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
View File

@@ -34,12 +34,12 @@
#include <OSL/genclosure.h>
#include "kernel_compat_cpu.h"
#include "osl_closures.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/osl/osl_closures.h"
#include "kernel_types.h"
#include "closure/alloc.h"
#include "closure/bsdf_phong_ramp.h"
#include "kernel/kernel_types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_phong_ramp.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/kernel/osl/emissive.cpp
View File

@@ -34,12 +34,12 @@
#include <OSL/genclosure.h>
#include "osl_closures.h"
#include "kernel/osl/osl_closures.h"
#include "kernel_compat_cpu.h"
#include "kernel_types.h"
#include "closure/alloc.h"
#include "closure/emissive.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/kernel_types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/emissive.h"
CCL_NAMESPACE_BEGIN

14
intern/cycles/kernel/osl/osl_bssrdf.cpp
View File

@@ -32,15 +32,15 @@
#include <OSL/genclosure.h>
#include "kernel_compat_cpu.h"
#include "osl_closures.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/osl/osl_closures.h"
#include "kernel_types.h"
#include "kernel_montecarlo.h"
#include "kernel/kernel_types.h"
#include "kernel/kernel_montecarlo.h"
#include "closure/alloc.h"
#include "closure/bsdf_diffuse.h"
#include "closure/bssrdf.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_diffuse.h"
#include "kernel/closure/bssrdf.h"
CCL_NAMESPACE_BEGIN

50
intern/cycles/kernel/osl/osl_closures.cpp
View File

@@ -33,34 +33,34 @@
#include <OSL/genclosure.h>
#include <OSL/oslclosure.h>
#include "osl_closures.h"
#include "osl_shader.h"
#include "kernel/osl/osl_closures.h"
#include "kernel/osl/osl_shader.h"
#include "util_debug.h"
#include "util_math.h"
#include "util_param.h"
#include "util/util_debug.h"
#include "util/util_math.h"
#include "util/util_param.h"
#include "kernel_types.h"
#include "kernel_compat_cpu.h"
#include "split/kernel_split_data_types.h"
#include "kernel_globals.h"
#include "kernel_montecarlo.h"
#include "kernel_random.h"
#include "kernel/kernel_types.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/split/kernel_split_data_types.h"
#include "kernel/kernel_globals.h"
#include "kernel/kernel_montecarlo.h"
#include "kernel/kernel_random.h"
#include "closure/alloc.h"
#include "closure/bsdf_util.h"
#include "closure/bsdf_ashikhmin_velvet.h"
#include "closure/bsdf_diffuse.h"
#include "closure/bsdf_microfacet.h"
#include "closure/bsdf_microfacet_multi.h"
#include "closure/bsdf_oren_nayar.h"
#include "closure/bsdf_reflection.h"
#include "closure/bsdf_refraction.h"
#include "closure/bsdf_transparent.h"
#include "closure/bsdf_ashikhmin_shirley.h"
#include "closure/bsdf_toon.h"
#include "closure/bsdf_hair.h"
#include "closure/volume.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_util.h"
#include "kernel/closure/bsdf_ashikhmin_velvet.h"
#include "kernel/closure/bsdf_diffuse.h"
#include "kernel/closure/bsdf_microfacet.h"
#include "kernel/closure/bsdf_microfacet_multi.h"
#include "kernel/closure/bsdf_oren_nayar.h"
#include "kernel/closure/bsdf_reflection.h"
#include "kernel/closure/bsdf_refraction.h"
#include "kernel/closure/bsdf_transparent.h"
#include "kernel/closure/bsdf_ashikhmin_shirley.h"
#include "kernel/closure/bsdf_toon.h"
#include "kernel/closure/bsdf_hair.h"
#include "kernel/closure/volume.h"
CCL_NAMESPACE_BEGIN

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

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

8
intern/cycles/kernel/osl/osl_globals.h
View File

@@ -21,10 +21,10 @@
#include <OSL/oslexec.h>
#include "util_map.h"
#include "util_param.h"
#include "util_thread.h"
#include "util_vector.h"
#include "util/util_map.h"
#include "util/util_param.h"
#include "util/util_thread.h"
#include "util/util_vector.h"
#ifndef WIN32
using std::isfinite;

48
intern/cycles/kernel/osl/osl_services.cpp
View File

@@ -25,34 +25,34 @@
#include <string.h>
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "osl_closures.h"
#include "osl_globals.h"
#include "osl_services.h"
#include "osl_shader.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 "util_foreach.h"
#include "util_logging.h"
#include "util_string.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_string.h"
#include "kernel_compat_cpu.h"
#include "split/kernel_split_data_types.h"
#include "kernel_globals.h"
#include "kernel_random.h"
#include "kernel_projection.h"
#include "kernel_differential.h"
#include "kernel_montecarlo.h"
#include "kernel_camera.h"
#include "kernels/cpu/kernel_cpu_image.h"
#include "geom/geom.h"
#include "bvh/bvh.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/split/kernel_split_data_types.h"
#include "kernel/kernel_globals.h"
#include "kernel/kernel_random.h"
#include "kernel/kernel_projection.h"
#include "kernel/kernel_differential.h"
#include "kernel/kernel_montecarlo.h"
#include "kernel/kernel_camera.h"
#include "kernel/kernels/cpu/kernel_cpu_image.h"
#include "kernel/geom/geom.h"
#include "kernel/bvh/bvh.h"
#include "kernel_projection.h"
#include "kernel_accumulate.h"
#include "kernel_shader.h"
#include "kernel/kernel_projection.h"
#include "kernel/kernel_accumulate.h"
#include "kernel/kernel_shader.h"
#ifdef WITH_PTEX
# include <Ptexture.h>

24
intern/cycles/kernel/osl/osl_shader.cpp
View File

@@ -16,22 +16,22 @@
#include <OSL/oslexec.h>
#include "kernel_compat_cpu.h"
#include "kernel_montecarlo.h"
#include "kernel_types.h"
#include "split/kernel_split_data_types.h"
#include "kernel_globals.h"
#include "kernel/kernel_compat_cpu.h"
#include "kernel/kernel_montecarlo.h"
#include "kernel/kernel_types.h"
#include "kernel/split/kernel_split_data_types.h"
#include "kernel/kernel_globals.h"
#include "geom/geom_object.h"
#include "kernel/geom/geom_object.h"
#include "osl_closures.h"
#include "osl_globals.h"
#include "osl_services.h"
#include "osl_shader.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 "util_foreach.h"
#include "util/util_foreach.h"
#include "attribute.h"
#include "render/attribute.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/kernel/osl/osl_shader.h
View File

@@ -29,7 +29,7 @@
* This means no thread state must be passed along in the kernel itself.
*/
#include "kernel_types.h"
#include "kernel/kernel_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/kernel/split/kernel_data_init.h
View File

@@ -54,7 +54,7 @@ void KERNEL_FUNCTION_FULL_NAME(data_init)(
#ifdef __KERNEL_OPENCL__
#define KERNEL_TEX(type, ttype, name) \
ccl_global type *name,
#include "../kernel_textures.h"
#include "kernel/kernel_textures.h"
#endif
int start_sample,
@@ -98,7 +98,7 @@ void KERNEL_FUNCTION_FULL_NAME(data_init)(
#ifdef __KERNEL_OPENCL__
#define KERNEL_TEX(type, ttype, name) \
kg->name = name;
#include "../kernel_textures.h"
#include "kernel/kernel_textures.h"
#endif
int thread_index = ccl_global_id(1) * ccl_global_size(0) + ccl_global_id(0);

62
intern/cycles/kernel/split/kernel_split_common.h
View File

@@ -17,61 +17,61 @@
#ifndef __KERNEL_SPLIT_H__
#define __KERNEL_SPLIT_H__
#include "kernel_math.h"
#include "kernel_types.h"
#include "kernel/kernel_math.h"
#include "kernel/kernel_types.h"
#include "kernel_split_data.h"
#include "kernel/split/kernel_split_data.h"
#include "kernel_globals.h"
#include "kernel/kernel_globals.h"
#ifdef __OSL__
# include "osl_shader.h"
# include "kernel/osl/osl_shader.h"
#endif
#ifdef __KERNEL_OPENCL__
# include "kernel_image_opencl.h"
# include "kernel/kernel_image_opencl.h"
#endif
#ifdef __KERNEL_CPU__
# include "../kernels/cpu/kernel_cpu_image.h"
# include "kernel/kernels/cpu/kernel_cpu_image.h"
#endif
#include "util_atomic.h"
#include "util/util_atomic.h"
#include "kernel_random.h"
#include "kernel_projection.h"
#include "kernel_montecarlo.h"
#include "kernel_differential.h"
#include "kernel_camera.h"
#include "kernel/kernel_random.h"
#include "kernel/kernel_projection.h"
#include "kernel/kernel_montecarlo.h"
#include "kernel/kernel_differential.h"
#include "kernel/kernel_camera.h"
#include "geom/geom.h"
#include "bvh/bvh.h"
#include "kernel/geom/geom.h"
#include "kernel/bvh/bvh.h"
#include "kernel_accumulate.h"
#include "kernel_shader.h"
#include "kernel_light.h"
#include "kernel_passes.h"
#include "kernel/kernel_accumulate.h"
#include "kernel/kernel_shader.h"
#include "kernel/kernel_light.h"
#include "kernel/kernel_passes.h"
#ifdef __SUBSURFACE__
# include "kernel_subsurface.h"
# include "kernel/kernel_subsurface.h"
#endif
#ifdef __VOLUME__
# include "kernel_volume.h"
# include "kernel/kernel_volume.h"
#endif
#include "kernel_path_state.h"
#include "kernel_shadow.h"
#include "kernel_emission.h"
#include "kernel_path_common.h"
#include "kernel_path_surface.h"
#include "kernel_path_volume.h"
#include "kernel_path_subsurface.h"
#include "kernel/kernel_path_state.h"
#include "kernel/kernel_shadow.h"
#include "kernel/kernel_emission.h"
#include "kernel/kernel_path_common.h"
#include "kernel/kernel_path_surface.h"
#include "kernel/kernel_path_volume.h"
#include "kernel/kernel_path_subsurface.h"
#ifdef __KERNEL_DEBUG__
# include "kernel_debug.h"
# include "kernel/kernel_debug.h"
#endif
#include "kernel_queues.h"
#include "kernel_work_stealing.h"
#include "kernel/kernel_queues.h"
#include "kernel/kernel_work_stealing.h"
#endif /* __KERNEL_SPLIT_H__ */

4
intern/cycles/kernel/split/kernel_split_data.h
View File

@@ -17,8 +17,8 @@
#ifndef __KERNEL_SPLIT_DATA_H__
#define __KERNEL_SPLIT_DATA_H__
#include "kernel_split_data_types.h"
#include "kernel_globals.h"
#include "kernel/split/kernel_split_data_types.h"
#include "kernel/kernel_globals.h"
CCL_NAMESPACE_BEGIN

82
intern/cycles/kernel/svm/svm.h
View File

@@ -39,7 +39,7 @@
* mostly taken care of in the SVM compiler.
*/
#include "svm_types.h"
#include "kernel/svm/svm_types.h"
CCL_NAMESPACE_BEGIN
@@ -139,49 +139,49 @@ CCL_NAMESPACE_END
/* Nodes */
#include "svm_noise.h"
#include "kernel/svm/svm_noise.h"
#include "svm_texture.h"
#include "svm_color_util.h"
#include "svm_math_util.h"
#include "kernel/svm/svm_color_util.h"
#include "kernel/svm/svm_math_util.h"
#include "svm_attribute.h"
#include "svm_gradient.h"
#include "svm_blackbody.h"
#include "svm_closure.h"
#include "svm_noisetex.h"
#include "svm_convert.h"
#include "svm_displace.h"
#include "svm_fresnel.h"
#include "svm_wireframe.h"
#include "svm_wavelength.h"
#include "svm_camera.h"
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
#include "svm_gamma.h"
#include "svm_brightness.h"
#include "svm_invert.h"
#include "svm_light_path.h"
#include "svm_magic.h"
#include "svm_mapping.h"
#include "svm_normal.h"
#include "svm_wave.h"
#include "svm_math.h"
#include "svm_mix.h"
#include "svm_ramp.h"
#include "svm_sepcomb_hsv.h"
#include "svm_sepcomb_vector.h"
#include "svm_musgrave.h"
#include "svm_sky.h"
#include "svm_tex_coord.h"
#include "svm_value.h"
#include "svm_voronoi.h"
#include "svm_checker.h"
#include "svm_brick.h"
#include "svm_vector_transform.h"
#include "svm_voxel.h"
#include "svm_bump.h"
#include "kernel/svm/svm_attribute.h"
#include "kernel/svm/svm_gradient.h"
#include "kernel/svm/svm_blackbody.h"
#include "kernel/svm/svm_closure.h"
#include "kernel/svm/svm_noisetex.h"
#include "kernel/svm/svm_convert.h"
#include "kernel/svm/svm_displace.h"
#include "kernel/svm/svm_fresnel.h"
#include "kernel/svm/svm_wireframe.h"
#include "kernel/svm/svm_wavelength.h"
#include "kernel/svm/svm_camera.h"
#include "kernel/svm/svm_geometry.h"
#include "kernel/svm/svm_hsv.h"
#include "kernel/svm/svm_image.h"
#include "kernel/svm/svm_gamma.h"
#include "kernel/svm/svm_brightness.h"
#include "kernel/svm/svm_invert.h"
#include "kernel/svm/svm_light_path.h"
#include "kernel/svm/svm_magic.h"
#include "kernel/svm/svm_mapping.h"
#include "kernel/svm/svm_normal.h"
#include "kernel/svm/svm_wave.h"
#include "kernel/svm/svm_math.h"
#include "kernel/svm/svm_mix.h"
#include "kernel/svm/svm_ramp.h"
#include "kernel/svm/svm_sepcomb_hsv.h"
#include "kernel/svm/svm_sepcomb_vector.h"
#include "kernel/svm/svm_musgrave.h"
#include "kernel/svm/svm_sky.h"
#include "kernel/svm/svm_tex_coord.h"
#include "kernel/svm/svm_value.h"
#include "kernel/svm/svm_voronoi.h"
#include "kernel/svm/svm_checker.h"
#include "kernel/svm/svm_brick.h"
#include "kernel/svm/svm_vector_transform.h"
#include "kernel/svm/svm_voxel.h"
#include "kernel/svm/svm_bump.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/render/CMakeLists.txt
View File

@@ -1,14 +1,6 @@
set(INC
.
../device
../graph
../kernel
../kernel/svm
../kernel/osl
../bvh
../subd
../util
..
../../glew-mx
)

12
intern/cycles/render/attribute.cpp
View File

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

10
intern/cycles/render/attribute.h
View File

@@ -17,12 +17,12 @@
#ifndef __ATTRIBUTE_H__
#define __ATTRIBUTE_H__
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "util_list.h"
#include "util_param.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_list.h"
#include "util/util_param.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

20
intern/cycles/render/background.cpp
View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
#include "background.h"
#include "device.h"
#include "integrator.h"
#include "graph.h"
#include "nodes.h"
#include "scene.h"
#include "shader.h"
#include "render/background.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/graph.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "render/shader.h"
#include "util_foreach.h"
#include "util_math.h"
#include "util_types.h"
#include "util/util_foreach.h"
#include "util/util_math.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/background.h
View File

@@ -17,9 +17,9 @@
#ifndef __BACKGROUND_H__
#define __BACKGROUND_H__
#include "node.h"
#include "graph/node.h"
#include "util_types.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/bake.cpp
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "bake.h"
#include "integrator.h"
#include "render/bake.h"
#include "render/integrator.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/render/bake.h
View File

@@ -17,11 +17,11 @@
#ifndef __BAKE_H__
#define __BAKE_H__
#include "device.h"
#include "scene.h"
#include "device/device.h"
#include "render/scene.h"
#include "util_progress.h"
#include "util_vector.h"
#include "util/util_progress.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

20
intern/cycles/render/buffers.cpp
View File

@@ -16,17 +16,17 @@
#include <stdlib.h>
#include "buffers.h"
#include "device.h"
#include "render/buffers.h"
#include "device/device.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_hash.h"
#include "util_image.h"
#include "util_math.h"
#include "util_opengl.h"
#include "util_time.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_hash.h"
#include "util/util_image.h"
#include "util/util_math.h"
#include "util/util_opengl.h"
#include "util/util_time.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

14
intern/cycles/render/buffers.h
View File

@@ -17,16 +17,16 @@
#ifndef __BUFFERS_H__
#define __BUFFERS_H__
#include "device_memory.h"
#include "device/device_memory.h"
#include "film.h"
#include "render/film.h"
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "util_half.h"
#include "util_string.h"
#include "util_thread.h"
#include "util_types.h"
#include "util/util_half.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

20
intern/cycles/render/camera.cpp
View File

@@ -14,18 +14,18 @@
* limitations under the License.
*/
#include "camera.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "tables.h"
#include "render/camera.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/tables.h"
#include "device.h"
#include "device/device.h"
#include "util_foreach.h"
#include "util_function.h"
#include "util_math_cdf.h"
#include "util_vector.h"
#include "util/util_foreach.h"
#include "util/util_function.h"
#include "util/util_math_cdf.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/render/camera.h
View File

@@ -17,13 +17,13 @@
#ifndef __CAMERA_H__
#define __CAMERA_H__
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "node.h"
#include "graph/node.h"
#include "util_boundbox.h"
#include "util_transform.h"
#include "util_types.h"
#include "util/util_boundbox.h"
#include "util/util_transform.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/render/constant_fold.cpp
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include "constant_fold.h"
#include "graph.h"
#include "render/constant_fold.h"
#include "render/graph.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/constant_fold.h
View File

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

18
intern/cycles/render/curves.cpp
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
#include "device.h"
#include "curves.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "device/device.h"
#include "render/curves.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "util_foreach.h"
#include "util_map.h"
#include "util_progress.h"
#include "util_vector.h"
#include "util/util_foreach.h"
#include "util/util_map.h"
#include "util/util_progress.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/curves.h
View File

@@ -17,8 +17,8 @@
#ifndef __CURVES_H__
#define __CURVES_H__
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

24
intern/cycles/render/film.cpp
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
#include "camera.h"
#include "device.h"
#include "film.h"
#include "integrator.h"
#include "mesh.h"
#include "scene.h"
#include "tables.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/film.h"
#include "render/integrator.h"
#include "render/mesh.h"
#include "render/scene.h"
#include "render/tables.h"
#include "util_algorithm.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_math.h"
#include "util_math_cdf.h"
#include "util/util_algorithm.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_math.h"
#include "util/util_math_cdf.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/render/film.h
View File

@@ -17,12 +17,12 @@
#ifndef __FILM_H__
#define __FILM_H__
#include "util_string.h"
#include "util_vector.h"
#include "util/util_string.h"
#include "util/util_vector.h"
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "node.h"
#include "graph/node.h"
CCL_NAMESPACE_BEGIN

22
intern/cycles/render/graph.cpp
View File

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

18
intern/cycles/render/graph.h
View File

@@ -17,17 +17,17 @@
#ifndef __GRAPH_H__
#define __GRAPH_H__
#include "node.h"
#include "node_type.h"
#include "graph/node.h"
#include "graph/node_type.h"
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "util_list.h"
#include "util_map.h"
#include "util_param.h"
#include "util_set.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_list.h"
#include "util/util_map.h"
#include "util/util_param.h"
#include "util/util_set.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

16
intern/cycles/render/image.cpp
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
#include "device.h"
#include "image.h"
#include "scene.h"
#include "device/device.h"
#include "render/image.h"
#include "render/scene.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_path.h"
#include "util_progress.h"
#include "util_texture.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_path.h"
#include "util/util_progress.h"
#include "util/util_texture.h"
#ifdef WITH_OSL
#include <OSL/oslexec.h>

12
intern/cycles/render/image.h
View File

@@ -17,13 +17,13 @@
#ifndef __IMAGE_H__
#define __IMAGE_H__
#include "device.h"
#include "device_memory.h"
#include "device/device.h"
#include "device/device_memory.h"
#include "util_image.h"
#include "util_string.h"
#include "util_thread.h"
#include "util_vector.h"
#include "util/util_image.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

18
intern/cycles/render/integrator.cpp
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
#include "device.h"
#include "integrator.h"
#include "film.h"
#include "light.h"
#include "scene.h"
#include "shader.h"
#include "sobol.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/film.h"
#include "render/light.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/sobol.h"
#include "util_foreach.h"
#include "util_hash.h"
#include "util/util_foreach.h"
#include "util/util_hash.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/integrator.h
View File

@@ -17,9 +17,9 @@
#ifndef __INTEGRATOR_H__
#define __INTEGRATOR_H__
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "node.h"
#include "graph/node.h"
CCL_NAMESPACE_BEGIN

24
intern/cycles/render/light.cpp
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
#include "background.h"
#include "device.h"
#include "integrator.h"
#include "film.h"
#include "light.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "shader.h"
#include "render/background.h"
#include "device/device.h"
#include "render/integrator.h"
#include "render/film.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/shader.h"
#include "util_foreach.h"
#include "util_progress.h"
#include "util_logging.h"
#include "util/util_foreach.h"
#include "util/util_progress.h"
#include "util/util_logging.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/render/light.h
View File

@@ -17,12 +17,12 @@
#ifndef __LIGHT_H__
#define __LIGHT_H__
#include "kernel_types.h"
#include "kernel/kernel_types.h"
#include "node.h"
#include "graph/node.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

38
intern/cycles/render/mesh.cpp
View File

@@ -14,29 +14,29 @@
* limitations under the License.
*/
#include "bvh.h"
#include "bvh_build.h"
#include "bvh/bvh.h"
#include "bvh/bvh_build.h"
#include "camera.h"
#include "curves.h"
#include "device.h"
#include "graph.h"
#include "shader.h"
#include "light.h"
#include "mesh.h"
#include "nodes.h"
#include "object.h"
#include "scene.h"
#include "render/camera.h"
#include "render/curves.h"
#include "device/device.h"
#include "render/graph.h"
#include "render/shader.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/object.h"
#include "render/scene.h"
#include "osl_globals.h"
#include "kernel/osl/osl_globals.h"
#include "subd_split.h"
#include "subd_patch_table.h"
#include "subd/subd_split.h"
#include "subd/subd_patch_table.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_progress.h"
#include "util_set.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_progress.h"
#include "util/util_set.h"
CCL_NAMESPACE_BEGIN

21
intern/cycles/render/mesh.h
View File

@@ -17,17 +17,18 @@
#ifndef __MESH_H__
#define __MESH_H__
#include "attribute.h"
#include "node.h"
#include "shader.h"
#include "graph/node.h"
#include "util_boundbox.h"
#include "util_list.h"
#include "util_map.h"
#include "util_param.h"
#include "util_transform.h"
#include "util_types.h"
#include "util_vector.h"
#include "render/attribute.h"
#include "render/shader.h"
#include "util/util_boundbox.h"
#include "util/util_list.h"
#include "util/util_map.h"
#include "util/util_param.h"
#include "util/util_transform.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

14
intern/cycles/render/mesh_displace.cpp
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
#include "device.h"
#include "device/device.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "shader.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/shader.h"
#include "util_foreach.h"
#include "util_progress.h"
#include "util/util_foreach.h"
#include "util/util_progress.h"
CCL_NAMESPACE_BEGIN

16
intern/cycles/render/mesh_subdivision.cpp
View File

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

28
intern/cycles/render/nodes.cpp
View File

@@ -14,21 +14,21 @@
* limitations under the License.
*/
#include "image.h"
#include "integrator.h"
#include "nodes.h"
#include "scene.h"
#include "svm.h"
#include "svm_color_util.h"
#include "svm_ramp_util.h"
#include "svm_math_util.h"
#include "osl.h"
#include "constant_fold.h"
#include "render/image.h"
#include "render/integrator.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "render/svm.h"
#include "kernel/svm/svm_color_util.h"
#include "kernel/svm/svm_ramp_util.h"
#include "kernel/svm/svm_math_util.h"
#include "render/osl.h"
#include "render/constant_fold.h"
#include "util_sky_model.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_transform.h"
#include "util/util_sky_model.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_transform.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/render/nodes.h
View File

@@ -17,10 +17,10 @@
#ifndef __NODES_H__
#define __NODES_H__
#include "graph.h"
#include "node.h"
#include "render/graph.h"
#include "graph/node.h"
#include "util_string.h"
#include "util/util_string.h"
CCL_NAMESPACE_BEGIN

28
intern/cycles/render/object.cpp
View File

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

14
intern/cycles/render/object.h
View File

@@ -17,14 +17,14 @@
#ifndef __OBJECT_H__
#define __OBJECT_H__
#include "node.h"
#include "scene.h"
#include "graph/node.h"
#include "render/scene.h"
#include "util_boundbox.h"
#include "util_param.h"
#include "util_transform.h"
#include "util_thread.h"
#include "util_types.h"
#include "util/util_boundbox.h"
#include "util/util_param.h"
#include "util/util_transform.h"
#include "util/util_thread.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

30
intern/cycles/render/osl.cpp
View File

@@ -14,26 +14,26 @@
* limitations under the License.
*/
#include "device.h"
#include "device/device.h"
#include "graph.h"
#include "light.h"
#include "osl.h"
#include "scene.h"
#include "shader.h"
#include "nodes.h"
#include "render/graph.h"
#include "render/light.h"
#include "render/osl.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/nodes.h"
#ifdef WITH_OSL
#include "osl_globals.h"
#include "osl_services.h"
#include "osl_shader.h"
#include "kernel/osl/osl_globals.h"
#include "kernel/osl/osl_services.h"
#include "kernel/osl/osl_shader.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_md5.h"
#include "util_path.h"
#include "util_progress.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_md5.h"
#include "util/util_path.h"
#include "util/util_progress.h"
#endif

12
intern/cycles/render/osl.h
View File

@@ -17,13 +17,13 @@
#ifndef __OSL_H__
#define __OSL_H__
#include "util_set.h"
#include "util_string.h"
#include "util_thread.h"
#include "util/util_set.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "graph.h"
#include "nodes.h"
#include "shader.h"
#include "render/graph.h"
#include "render/nodes.h"
#include "render/shader.h"
#ifdef WITH_OSL
#include <OSL/oslcomp.h>

16
intern/cycles/render/particles.cpp
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
#include "device.h"
#include "particles.h"
#include "scene.h"
#include "device/device.h"
#include "render/particles.h"
#include "render/scene.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_map.h"
#include "util_progress.h"
#include "util_vector.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_map.h"
#include "util/util_progress.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/particles.h
View File

@@ -17,8 +17,8 @@
#ifndef __PARTICLES_H__
#define __PARTICLES_H__
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

40
intern/cycles/render/scene.cpp
View File

@@ -16,27 +16,27 @@
#include <stdlib.h>
#include "background.h"
#include "bake.h"
#include "camera.h"
#include "curves.h"
#include "device.h"
#include "film.h"
#include "integrator.h"
#include "light.h"
#include "mesh.h"
#include "object.h"
#include "osl.h"
#include "particles.h"
#include "scene.h"
#include "shader.h"
#include "svm.h"
#include "tables.h"
#include "render/background.h"
#include "render/bake.h"
#include "render/camera.h"
#include "render/curves.h"
#include "device/device.h"
#include "render/film.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/osl.h"
#include "render/particles.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/svm.h"
#include "render/tables.h"
#include "util_foreach.h"
#include "util_guarded_allocator.h"
#include "util_logging.h"
#include "util_progress.h"
#include "util/util_foreach.h"
#include "util/util_guarded_allocator.h"
#include "util/util_logging.h"
#include "util/util_progress.h"
CCL_NAMESPACE_BEGIN

20
intern/cycles/render/scene.h
View File

@@ -17,18 +17,18 @@
#ifndef __SCENE_H__
#define __SCENE_H__
#include "image.h"
#include "shader.h"
#include "render/image.h"
#include "render/shader.h"
#include "device_memory.h"
#include "device/device_memory.h"
#include "util_param.h"
#include "util_string.h"
#include "util_system.h"
#include "util_texture.h"
#include "util_thread.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_param.h"
#include "util/util_string.h"
#include "util/util_system.h"
#include "util/util_texture.h"
#include "util/util_thread.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

34
intern/cycles/render/session.cpp
View File

@@ -17,24 +17,24 @@
#include <string.h>
#include <limits.h>
#include "buffers.h"
#include "camera.h"
#include "device.h"
#include "graph.h"
#include "integrator.h"
#include "mesh.h"
#include "object.h"
#include "scene.h"
#include "session.h"
#include "bake.h"
#include "render/buffers.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/mesh.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/session.h"
#include "render/bake.h"
#include "util_foreach.h"
#include "util_function.h"
#include "util_logging.h"
#include "util_math.h"
#include "util_opengl.h"
#include "util_task.h"
#include "util_time.h"
#include "util/util_foreach.h"
#include "util/util_function.h"
#include "util/util_logging.h"
#include "util/util_math.h"
#include "util/util_opengl.h"
#include "util/util_task.h"
#include "util/util_time.h"
CCL_NAMESPACE_BEGIN

16
intern/cycles/render/session.h
View File

@@ -17,15 +17,15 @@
#ifndef __SESSION_H__
#define __SESSION_H__
#include "buffers.h"
#include "device.h"
#include "shader.h"
#include "tile.h"
#include "render/buffers.h"
#include "device/device.h"
#include "render/shader.h"
#include "render/tile.h"
#include "util_progress.h"
#include "util_stats.h"
#include "util_thread.h"
#include "util_vector.h"
#include "util/util_progress.h"
#include "util/util_stats.h"
#include "util/util_thread.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

30
intern/cycles/render/shader.cpp
View File

@@ -14,22 +14,22 @@
* limitations under the License.
*/
#include "background.h"
#include "camera.h"
#include "device.h"
#include "graph.h"
#include "integrator.h"
#include "light.h"
#include "mesh.h"
#include "nodes.h"
#include "object.h"
#include "osl.h"
#include "scene.h"
#include "shader.h"
#include "svm.h"
#include "tables.h"
#include "render/background.h"
#include "render/camera.h"
#include "device/device.h"
#include "render/graph.h"
#include "render/integrator.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/object.h"
#include "render/osl.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/svm.h"
#include "render/tables.h"
#include "util_foreach.h"
#include "util/util_foreach.h"
CCL_NAMESPACE_BEGIN

18
intern/cycles/render/shader.h
View File

@@ -19,20 +19,20 @@
#ifdef WITH_OSL
/* So no context pollution happens from indirectly included windows.h */
# include "util_windows.h"
# include "util/util_windows.h"
# include <OSL/oslexec.h>
#endif
#include "attribute.h"
#include "kernel_types.h"
#include "render/attribute.h"
#include "kernel/kernel_types.h"
#include "node.h"
#include "graph/node.h"
#include "util_map.h"
#include "util_param.h"
#include "util_string.h"
#include "util_thread.h"
#include "util_types.h"
#include "util/util_map.h"
#include "util/util_param.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/render/sobol.cpp
View File

@@ -46,10 +46,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "util_debug.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_types.h"
#include "sobol.h"
#include "render/sobol.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/render/sobol.h
View File

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

26
intern/cycles/render/svm.cpp
View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
#include "device.h"
#include "graph.h"
#include "light.h"
#include "mesh.h"
#include "nodes.h"
#include "scene.h"
#include "shader.h"
#include "svm.h"
#include "device/device.h"
#include "render/graph.h"
#include "render/light.h"
#include "render/mesh.h"
#include "render/nodes.h"
#include "render/scene.h"
#include "render/shader.h"
#include "render/svm.h"
#include "util_debug.h"
#include "util_logging.h"
#include "util_foreach.h"
#include "util_progress.h"
#include "util_task.h"
#include "util/util_debug.h"
#include "util/util_logging.h"
#include "util/util_foreach.h"
#include "util/util_progress.h"
#include "util/util_task.h"
CCL_NAMESPACE_BEGIN

12
intern/cycles/render/svm.h
View File

@@ -17,13 +17,13 @@
#ifndef __SVM_H__
#define __SVM_H__
#include "attribute.h"
#include "graph.h"
#include "shader.h"
#include "render/attribute.h"
#include "render/graph.h"
#include "render/shader.h"
#include "util_set.h"
#include "util_string.h"
#include "util_thread.h"
#include "util/util_set.h"
#include "util/util_string.h"
#include "util/util_thread.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/render/tables.cpp
View File

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

2
intern/cycles/render/tables.h
View File

@@ -17,7 +17,7 @@
#ifndef __TABLES_H__
#define __TABLES_H__
#include <util_list.h>
#include "util/util_list.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/render/tile.cpp
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "tile.h"
#include "render/tile.h"
#include "util_algorithm.h"
#include "util_types.h"
#include "util/util_algorithm.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/render/tile.h
View File

@@ -19,8 +19,8 @@
#include <limits.h>
#include "buffers.h"
#include "util_list.h"
#include "render/buffers.h"
#include "util/util_list.h"
CCL_NAMESPACE_BEGIN

7
intern/cycles/subd/CMakeLists.txt
View File

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

10
intern/cycles/subd/subd_dice.cpp
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
#include "camera.h"
#include "mesh.h"
#include "render/camera.h"
#include "render/mesh.h"
#include "subd_dice.h"
#include "subd_patch.h"
#include "subd/subd_dice.h"
#include "subd/subd_patch.h"
#include "util_debug.h"
#include "util/util_debug.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/subd/subd_dice.h
View File

@@ -22,8 +22,8 @@
* DiagSplit. For more algorithm details, see the DiagSplit paper or the
* ARB_tessellation_shader OpenGL extension, Section 2.X.2. */
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/subd/subd_patch.cpp
View File

@@ -16,12 +16,12 @@
/* Parts adapted from code in the public domain in NVidia Mesh Tools. */
#include "mesh.h"
#include "render/mesh.h"
#include "subd_patch.h"
#include "subd/subd_patch.h"
#include "util_math.h"
#include "util_types.h"
#include "util/util_math.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/subd/subd_patch.h
View File

@@ -17,8 +17,8 @@
#ifndef __SUBD_PATCH_H__
#define __SUBD_PATCH_H__
#include "util_boundbox.h"
#include "util_types.h"
#include "util/util_boundbox.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/subd/subd_patch_table.cpp
View File

@@ -25,10 +25,10 @@
*
*/
#include "subd_patch_table.h"
#include "kernel_types.h"
#include "subd/subd_patch_table.h"
#include "kernel/kernel_types.h"
#include "util_math.h"
#include "util/util_math.h"
#ifdef WITH_OPENSUBDIV
#include <opensubdiv/far/patchTable.h>

4
intern/cycles/subd/subd_patch_table.h
View File

@@ -17,8 +17,8 @@
#ifndef __SUBD_PATCH_TABLE_H__
#define __SUBD_PATCH_TABLE_H__
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
#ifdef WITH_OPENSUBDIV
#ifdef _MSC_VER

16
intern/cycles/subd/subd_split.cpp
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
#include "camera.h"
#include "mesh.h"
#include "render/camera.h"
#include "render/mesh.h"
#include "subd_dice.h"
#include "subd_patch.h"
#include "subd_split.h"
#include "subd/subd_dice.h"
#include "subd/subd_patch.h"
#include "subd/subd_split.h"
#include "util_debug.h"
#include "util_math.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_math.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/subd/subd_split.h
View File

@@ -22,10 +22,10 @@
* evaluation at arbitrary points is required for this to work. See the paper
* for more details. */
#include "subd_dice.h"
#include "subd/subd_dice.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
set(INC
.
..
../../glew-mx
)

4
intern/cycles/util/util_aligned_malloc.cpp
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "util_aligned_malloc.h"
#include "util_guarded_allocator.h"
#include "util/util_aligned_malloc.h"
#include "util/util_guarded_allocator.h"
#include <cassert>

2
intern/cycles/util/util_aligned_malloc.h
View File

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

8
intern/cycles/util/util_boundbox.h
View File

@@ -20,10 +20,10 @@
#include <math.h>
#include <float.h>
#include "util_math.h"
#include "util_string.h"
#include "util_transform.h"
#include "util_types.h"
#include "util/util_math.h"
#include "util/util_string.h"
#include "util/util_transform.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/util/util_color.h
View File

@@ -17,11 +17,11 @@
#ifndef __UTIL_COLOR_H__
#define __UTIL_COLOR_H__
#include "util_math.h"
#include "util_types.h"
#include "util/util_math.h"
#include "util/util_types.h"
#ifdef __KERNEL_SSE2__
#include "util_simd.h"
#include "util/util_simd.h"
#endif
CCL_NAMESPACE_BEGIN

6
intern/cycles/util/util_debug.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "util_debug.h"
#include "util/util_debug.h"
#include <stdlib.h>
#include "util_logging.h"
#include "util_string.h"
#include "util/util_logging.h"
#include "util/util_string.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_debug.h
View File

@@ -20,7 +20,7 @@
#include <cassert>
#include <iostream>
#include "util_static_assert.h"
#include "util/util_static_assert.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/util/util_guarded_allocator.cpp
View File

@@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "util_guarded_allocator.h"
#include "util_stats.h"
#include "util/util_guarded_allocator.h"
#include "util/util_stats.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/util/util_guarded_allocator.h
View File

@@ -20,8 +20,8 @@
#include <cstddef>
#include <memory>
#include "util_debug.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_types.h"
#ifdef WITH_BLENDER_GUARDEDALLOC
# include "../../guardedalloc/MEM_guardedalloc.h"

6
intern/cycles/util/util_half.h
View File

@@ -17,11 +17,11 @@
#ifndef __UTIL_HALF_H__
#define __UTIL_HALF_H__
#include "util_types.h"
#include "util_math.h"
#include "util/util_types.h"
#include "util/util_math.h"
#ifdef __KERNEL_SSE2__
#include "util_simd.h"
#include "util/util_simd.h"
#endif
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_hash.h
View File

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

4
intern/cycles/util/util_image.h
View File

@@ -21,7 +21,7 @@
#include <OpenImageIO/imageio.h>
#include "util_vector.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN
@@ -42,4 +42,4 @@ CCL_NAMESPACE_END
#endif /* __UTIL_IMAGE_H__ */
#include "util_image_impl.h"
#include "util/util_image_impl.h"

8
intern/cycles/util/util_image_impl.h
View File

@@ -17,10 +17,10 @@
#ifndef __UTIL_IMAGE_IMPL_H__
#define __UTIL_IMAGE_IMPL_H__
#include "util_algorithm.h"
#include "util_debug.h"
#include "util_half.h"
#include "util_image.h"
#include "util/util_algorithm.h"
#include "util/util_debug.h"
#include "util/util_half.h"
#include "util/util_image.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/util/util_logging.cpp
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
#include <util_logging.h>
#include "util/util_logging.h"
#include "util_math.h"
#include "util/util_math.h"
#include <stdio.h>
#ifdef _MSC_VER

2
intern/cycles/util/util_math.h
View File

@@ -35,7 +35,7 @@
#endif
#include "util_types.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/util/util_math_cdf.cpp
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "util_math_cdf.h"
#include "util/util_math_cdf.h"
#include "util_algorithm.h"
#include "util_math.h"
#include "util/util_algorithm.h"
#include "util/util_math.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/util/util_math_cdf.h
View File

@@ -17,9 +17,9 @@
#ifndef __UTIL_MATH_CDF_H__
#define __UTIL_MATH_CDF_H__
#include "util_algorithm.h"
#include "util_math.h"
#include "util_vector.h"
#include "util/util_algorithm.h"
#include "util/util_math.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

7
intern/cycles/util/util_math_intersect.h
View File

@@ -79,7 +79,12 @@ ccl_device bool ray_aligned_disk_intersect(
return true;
}
ccl_device_forceinline bool ray_triangle_intersect(
#if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300
ccl_device_inline
#else
ccl_device_forceinline
#endif
bool ray_triangle_intersect(
float3 ray_P, float3 ray_dir, float ray_t,
#if defined(__KERNEL_SSE2__) && defined(__KERNEL_SSE__)
const ssef *ssef_verts,

4
intern/cycles/util/util_md5.h
View File

@@ -30,8 +30,8 @@
#ifndef __UTIL_MD5_H__
#define __UTIL_MD5_H__
#include "util_string.h"
#include "util_types.h"
#include "util/util_string.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_optimization.h
View File

@@ -111,7 +111,7 @@
/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
* Since we can't avoid including <windows.h>, better only include that */
#include "util_windows.h"
#include "util/util_windows.h"
#endif

10
intern/cycles/util/util_path.cpp
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "util_debug.h"
#include "util_md5.h"
#include "util_path.h"
#include "util_string.h"
#include "util/util_debug.h"
#include "util/util_md5.h"
#include "util/util_path.h"
#include "util/util_string.h"
#include <OpenImageIO/filesystem.h>
#include <OpenImageIO/strutil.h>
@@ -45,7 +45,7 @@ OIIO_NAMESPACE_USING
# include <shlwapi.h>
#endif
#include "util_windows.h"
#include "util/util_windows.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/util/util_path.h
View File

@@ -24,10 +24,10 @@
#include <stdio.h>
#include "util_set.h"
#include "util_string.h"
#include "util_types.h"
#include "util_vector.h"
#include "util/util_set.h"
#include "util/util_string.h"
#include "util/util_types.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

8
intern/cycles/util/util_progress.h
View File

@@ -23,10 +23,10 @@
* update notifications from a job running in another thread. All methods
* except for the constructor/destructor are thread safe. */
#include "util_function.h"
#include "util_string.h"
#include "util_time.h"
#include "util_thread.h"
#include "util/util_function.h"
#include "util/util_string.h"
#include "util/util_time.h"
#include "util/util_thread.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_simd.cpp
View File

@@ -19,7 +19,7 @@
(defined(WITH_KERNEL_NATIVE) && defined(__SSE2__))
#define __KERNEL_SSE2__
#include "util_simd.h"
#include "util/util_simd.h"
CCL_NAMESPACE_BEGIN

14
intern/cycles/util/util_simd.h
View File

@@ -20,8 +20,8 @@
#include <limits>
#include "util_debug.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN
@@ -451,11 +451,11 @@ ccl_device_inline int bitscan(int value)
CCL_NAMESPACE_END
#include "util_math.h"
#include "util_sseb.h"
#include "util_ssei.h"
#include "util_ssef.h"
#include "util_avxf.h"
#include "util/util_math.h"
#include "util/util_sseb.h"
#include "util/util_ssei.h"
#include "util/util_ssef.h"
#include "util/util_avxf.h"
#endif /* __UTIL_SIMD_TYPES_H__ */

4
intern/cycles/util/util_sky_model.cpp
View File

@@ -97,8 +97,8 @@ All instructions on how to use this code are in the accompanying header file.
*/
#include "util_sky_model.h"
#include "util_sky_model_data.h"
#include "util/util_sky_model.h"
#include "util/util_sky_model_data.h"
#include <assert.h>
#include <stdio.h>

4
intern/cycles/util/util_stack_allocator.h
View File

@@ -20,8 +20,8 @@
#include <cstddef>
#include <memory>
#include "util_debug.h"
#include "util_types.h"
#include "util/util_debug.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_stats.h
View File

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

6
intern/cycles/util/util_string.cpp
View File

@@ -17,9 +17,9 @@
#include <stdarg.h>
#include <stdio.h>
#include "util_foreach.h"
#include "util_string.h"
#include "util_windows.h"
#include "util/util_foreach.h"
#include "util/util_string.h"
#include "util/util_windows.h"
#ifdef _WIN32
# ifndef vsnprintf

2
intern/cycles/util/util_string.h
View File

@@ -21,7 +21,7 @@
#include <string>
#include <sstream>
#include "util_vector.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/util/util_system.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "util_system.h"
#include "util/util_system.h"
#include "util_debug.h"
#include "util_logging.h"
#include "util_types.h"
#include "util_string.h"
#include "util/util_debug.h"
#include "util/util_logging.h"
#include "util/util_types.h"
#include "util/util_string.h"
#ifdef _WIN32
# if(!defined(FREE_WINDOWS))

2
intern/cycles/util/util_system.h
View File

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

12
intern/cycles/util/util_task.cpp
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "util_debug.h"
#include "util_foreach.h"
#include "util_logging.h"
#include "util_system.h"
#include "util_task.h"
#include "util_time.h"
#include "util/util_debug.h"
#include "util/util_foreach.h"
#include "util/util_logging.h"
#include "util/util_system.h"
#include "util/util_task.h"
#include "util/util_time.h"
//#define THREADING_DEBUG_ENABLED

8
intern/cycles/util/util_task.h
View File

@@ -17,10 +17,10 @@
#ifndef __UTIL_TASK_H__
#define __UTIL_TASK_H__
#include "util_list.h"
#include "util_string.h"
#include "util_thread.h"
#include "util_vector.h"
#include "util/util_list.h"
#include "util/util_string.h"
#include "util/util_thread.h"
#include "util/util_vector.h"
CCL_NAMESPACE_BEGIN

6
intern/cycles/util/util_thread.cpp
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
#include "util_thread.h"
#include "util/util_thread.h"
#include "util_system.h"
#include "util_windows.h"
#include "util/util_system.h"
#include "util/util_windows.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_thread.h
View File

@@ -32,7 +32,7 @@
# include <libkern/OSAtomic.h>
#endif
#include "util_function.h"
#include "util/util_function.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/util/util_time.cpp
View File

@@ -16,8 +16,8 @@
#include <stdlib.h>
#include "util_time.h"
#include "util_windows.h"
#include "util/util_time.h"
#include "util/util_windows.h"
#ifdef _WIN32

6
intern/cycles/util/util_transform.cpp
View File

@@ -46,10 +46,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "util_transform.h"
#include "util/util_transform.h"
#include "util_boundbox.h"
#include "util_math.h"
#include "util/util_boundbox.h"
#include "util/util_math.h"
CCL_NAMESPACE_BEGIN

4
intern/cycles/util/util_transform.h
View File

@@ -21,8 +21,8 @@
#include <string.h>
#endif
#include "util_math.h"
#include "util_types.h"
#include "util/util_math.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

2
intern/cycles/util/util_types.h
View File

@@ -85,7 +85,7 @@
/* SIMD Types */
#include "util_optimization.h"
#include "util/util_optimization.h"
#endif

6
intern/cycles/util/util_vector.h
View File

@@ -23,9 +23,9 @@
#include <cstring>
#include <vector>
#include "util_aligned_malloc.h"
#include "util_guarded_allocator.h"
#include "util_types.h"
#include "util/util_aligned_malloc.h"
#include "util/util_guarded_allocator.h"
#include "util/util_types.h"
CCL_NAMESPACE_BEGIN

10
intern/cycles/util/util_view.cpp
View File

@@ -17,11 +17,11 @@
#include <stdio.h>
#include <stdlib.h>
#include "util_opengl.h"
#include "util_string.h"
#include "util_time.h"
#include "util_version.h"
#include "util_view.h"
#include "util/util_opengl.h"
#include "util/util_string.h"
#include "util/util_time.h"
#include "util/util_version.h"
#include "util/util_view.h"
#ifdef __APPLE__
#include <GLUT/glut.h>

2
intern/cycles/util/util_windows.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "util_windows.h"
#include "util/util_windows.h"
#ifdef _WIN32