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

Cycles: change __device and similar qualifiers to ccl_device in kernel code.

Browse Source 
This to avoids build conflicts with libc++ on FreeBSD, these __ prefixed values
are reserved for compilers. I apologize to anyone who has patches or branches
and has to go through the pain of merging this change, it may be easiest to do
these same replacements in your code and then apply/merge the patch.

Ref T37477.
This commit is contained in:
Brecht Van Lommel
2013-11-16 00:17:10 +01:00
parent 6f67f7c18c
commit c18712e868
87 changed files with 804 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/svm/svm_light_path.h
View File

@@ -18,7 +18,7 @@ CCL_NAMESPACE_BEGIN
/* Light Path Node */
__device void svm_node_light_path(ShaderData *sd, float *stack, uint type, uint out_offset, int path_flag)
ccl_device void svm_node_light_path(ShaderData *sd, float *stack, uint type, uint out_offset, int path_flag)
{
float info = 0.0f;
@@ -40,7 +40,7 @@ __device void svm_node_light_path(ShaderData *sd, float *stack, uint type, uint
/* Light Falloff Node */
__device void svm_node_light_falloff(ShaderData *sd, float *stack, uint4 node)
ccl_device void svm_node_light_falloff(ShaderData *sd, float *stack, uint4 node)
{
uint strength_offset, out_offset, smooth_offset;