bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix OpenCL kernel build errors after recent 3D texture changes.

Browse Source
This commit is contained in:
Brecht Van Lommel 2016-02-17 01:20:46 +01:00
parent 833eb863eb
commit 0ccae52394
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
#include "../../kernel_film.h"
#ifdef __COMPILE_ONLY_MEGAKERNEL__
#if defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__)
#include "../../kernel_path.h"
#include "../../kernel_path_branched.h"
#else /* __COMPILE_ONLY_MEGAKERNEL__ */
@ -38,7 +38,7 @@
#include "../../kernel_accumulate.h"
#include "../../kernel_camera.h"
#include "../../kernel_shader.h"
#endif /* __COMPILE_ONLY_MEGAKERNEL__ */
#endif /* defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) */
#include "../../kernel_bake.h"

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

@ -27,6 +27,7 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
{
uint 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);
if(space == NODE_TEX_VOXEL_SPACE_OBJECT) {
@ -41,10 +42,13 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
tfm.w = read_node_float(kg, offset);
co = transform_point(&tfm, co);
}
#if defined(__KERNEL_GPU__)
# if defined(__KERNEL_GPU__)
float4 r = volume_image_texture_3d(id, co.x, co.y, co.z);
#else
# else
float4 r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z);
# endif
#else
float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
#endif
if (stack_valid(density_out_offset))
stack_store_float(stack, density_out_offset, r.w);