diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-15 17:40:39 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-15 23:26:29 +0300 |
| commit | 1c4f21f85e17ac557c9867a7764a31d5ebe74eb0 (patch) | |
| tree | 72ea537d6624e43e452ce7465f25f92832b88e4f /intern/cycles/kernel/svm/svm.h | |
| parent | b5171e250c6816ecce26227615d53cf6f6339892 (diff) | |
Cycles: Initial support of 3D textures for CUDA rendering
Supports both smoke/fire and point density textures now.
Reduces number of textures available for sm_20 and sm_21, but you have
to compromise somewhere on such a limited hardware.
Currently limited to linear interpolation only, and decoupled ray
marching is not supported yet. Think those could be considered just a
further improvement.
Some quick example:
https://developer.blender.org/F282934
Code is minimal and we can fully consider it a fix for missing
support of 3D textures with CUDA.
Reviewers: lukasstockner97, brecht, juicyfruit, dingto
Reviewed By: brecht, juicyfruit, dingto
Subscribers: mib2berlin
Differential Revision: https://developer.blender.org/D1806
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 633e1edfb19..9865da2e8cd 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -447,11 +447,11 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a svm_node_blackbody(kg, sd, stack, node.y, node.z); break; # endif /* __EXTRA_NODES__ */ -# if NODES_FEATURE(NODE_FEATURE_VOLUME) && !defined(__KERNEL_GPU__) +# if NODES_FEATURE(NODE_FEATURE_VOLUME) case NODE_TEX_VOXEL: svm_node_tex_voxel(kg, sd, stack, node, &offset); break; -# endif /* NODES_FEATURE(NODE_FEATURE_VOLUME) && !defined(__KERNEL_GPU__) */ +# endif /* NODES_FEATURE(NODE_FEATURE_VOLUME) */ #endif /* NODES_GROUP(NODE_GROUP_LEVEL_3) */ case NODE_END: return; |