Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation of OpenCL kernel after point density commit

Browse Source
This commit is contained in:
Sergey Sharybin
2015-07-18 23:05:29 +02:00
parent 003b56801c
commit faeac63f68
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/svm/svm_voxel.h
View File

@@ -25,9 +25,10 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
uint4 node, uint4 node,
int *offset) int *offset)
{ {
int id = node.y;
uint co_offset, density_out_offset, color_out_offset, space; uint co_offset, density_out_offset, color_out_offset, space;
decode_node_uchar4(node.z, &co_offset, &density_out_offset, &color_out_offset, &space); decode_node_uchar4(node.z, &co_offset, &density_out_offset, &color_out_offset, &space);
#ifdef __VOLUME__
int id = node.y;
float3 co = stack_load_float3(stack, co_offset); float3 co = stack_load_float3(stack, co_offset);
if(space == NODE_TEX_VOXEL_SPACE_OBJECT) { if(space == NODE_TEX_VOXEL_SPACE_OBJECT) {
co = volume_normalized_position(kg, sd, co); co = volume_normalized_position(kg, sd, co);
@@ -50,7 +51,8 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
stack_store_float3(stack, color_out_offset, make_float3(0.0f, 0.0f, 0.0f)); stack_store_float3(stack, color_out_offset, make_float3(0.0f, 0.0f, 0.0f));
return; return;
} }
#ifdef __KERNEL_GPU__ #endif /* __VOLUME__ */
#if defined(__KERNEL_GPU__) || !defined(__VOLUME__)
float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f); float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
#else #else
float4 r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z); float4 r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z);