diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-09-12 19:46:20 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-09-13 11:59:28 +0300 |
| commit | a45c36efae07f22dd1da1ebac728324aeafce85e (patch) | |
| tree | 842f27474a4b011786da5ef07ed5c6630e8203a9 /intern/cycles/kernel/integrator/volume_shader.h | |
| parent | 8e03df9bbc22baaf9d538e01c44f6857a8c9b43a (diff) | |
Cycles: Make OSL implementation independent from SVM
Cleans up the file structure to be more similar to that of the SVM
and also makes it possible to build kernels with OSL support, but
without having to include SVM support.
This patch was split from D15902.
Differential Revision: https://developer.blender.org/D15949
Diffstat (limited to 'intern/cycles/kernel/integrator/volume_shader.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/volume_shader.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/intern/cycles/kernel/integrator/volume_shader.h b/intern/cycles/kernel/integrator/volume_shader.h index a1d191e2d32..31039bfdcf5 100644 --- a/intern/cycles/kernel/integrator/volume_shader.h +++ b/intern/cycles/kernel/integrator/volume_shader.h @@ -10,10 +10,11 @@ #include "kernel/closure/bsdf_util.h" #include "kernel/closure/emissive.h" -#include "kernel/svm/svm.h" - +#ifdef __SVM__ +# include "kernel/svm/svm.h" +#endif #ifdef __OSL__ -# include "kernel/osl/shader.h" +# include "kernel/osl/osl.h" #endif CCL_NAMESPACE_BEGIN @@ -326,18 +327,18 @@ ccl_device_inline void volume_shader_eval(KernelGlobals kg, } /* evaluate shader */ -# ifdef __SVM__ -# ifdef __OSL__ +# ifdef __OSL__ if (kg->osl) { OSLShader::eval_volume(kg, state, sd, path_flag); } else -# endif +# endif { +# ifdef __SVM__ svm_eval_nodes<KERNEL_FEATURE_NODE_MASK_VOLUME, SHADER_TYPE_VOLUME>( kg, state, sd, NULL, path_flag); - } # endif + } /* Merge closures to avoid exceeding number of closures limit. */ if (!shadow) { |