diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-11-09 16:25:32 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-11-09 17:30:21 +0300 |
| commit | e6b38deb9dbb58118f6ee644409ce52f06eac5e5 (patch) | |
| tree | aa1c384db146094482f24c94f704742c6624db00 /intern/cycles/kernel/integrator/volume_shader.h | |
| parent | efe073f57c34b438d21750795e97458a3d007be7 (diff) | |
Cycles: Add basic support for using OSL with OptiX
This patch generalizes the OSL support in Cycles to include GPU
device types and adds an implementation for that in the OptiX
device. There are some caveats still, including simplified texturing
due to lack of OIIO on the GPU and a few missing OSL intrinsics.
Note that this is incomplete and missing an update to the OSL
library before being enabled! The implementation is already
committed now to simplify further development.
Maniphest Tasks: T101222
Differential Revision: https://developer.blender.org/D15902
Diffstat (limited to 'intern/cycles/kernel/integrator/volume_shader.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/volume_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/integrator/volume_shader.h b/intern/cycles/kernel/integrator/volume_shader.h index 0ff968723a1..f9050647c6d 100644 --- a/intern/cycles/kernel/integrator/volume_shader.h +++ b/intern/cycles/kernel/integrator/volume_shader.h @@ -493,8 +493,8 @@ ccl_device_inline void volume_shader_eval(KernelGlobals kg, /* evaluate shader */ # ifdef __OSL__ - if (kg->osl) { - OSLShader::eval_volume(kg, state, sd, path_flag); + if (kernel_data.kernel_features & KERNEL_FEATURE_OSL) { + osl_eval_nodes<SHADER_TYPE_VOLUME>(kg, state, sd, path_flag); } else # endif |