Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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_wave.h
View File

@@ -18,7 +18,7 @@ CCL_NAMESPACE_BEGIN
/* Wave */
__device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale)
ccl_device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale)
{
float n;
@@ -35,7 +35,7 @@ __device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float
return 0.5f + 0.5f * sinf(n);
}
__device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
ccl_device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
{
uint4 node2 = read_node(kg, offset);