diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-12-03 14:19:36 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-12-04 15:04:11 +0300 |
| commit | c10546f5e9fe2a300b6a21e1e16b22c93060d0e9 (patch) | |
| tree | 59cd62f21fb10c08d9143ca640b44848f38584a8 /intern/cycles/kernel/kernel_types.h | |
| parent | 7f2d356a672d838c90cf47e9ff4006b15c104148 (diff) | |
Cycles: Add support for shader raytracing in OptiX
Support for the AO and bevel shader nodes requires calling "optixTrace" from within the shading
VM, which is only allowed from inlined functions to the raygen program or callables. This patch
therefore converts the shading VM to use direct callables to make it work. To prevent performance
regressions a separate kernel module is compiled and used for this purpose.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D9733
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 8e2b0e46a66..6beabebb92f 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -139,8 +139,6 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_OPTIX__ # undef __BAKING__ # undef __BRANCHED_PATH__ -/* TODO(pmours): Cannot use optixTrace in non-inlined functions */ -# undef __SHADER_RAYTRACE__ #endif /* __KERNEL_OPTIX__ */ #ifdef __KERNEL_OPENCL__ |