diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
| commit | e9bbfd0c8c7a508d220bf355722ff03f91e93183 (patch) | |
| tree | 1230f26bc82f24547aeccbaa7fcd6d3db2655fd3 /intern/cycles/kernel/device/optix/kernel.cu | |
| parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
| parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) | |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/kernel/device/optix/kernel.cu')
| -rw-r--r-- | intern/cycles/kernel/device/optix/kernel.cu | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/device/optix/kernel.cu b/intern/cycles/kernel/device/optix/kernel.cu index a3bafb9846c..6989219cd9f 100644 --- a/intern/cycles/kernel/device/optix/kernel.cu +++ b/intern/cycles/kernel/device/optix/kernel.cu @@ -21,14 +21,14 @@ #include "kernel/device/gpu/image.h" /* Texture lookup uses normal CUDA intrinsics. */ -#include "kernel/integrator/integrator_state.h" -#include "kernel/integrator/integrator_state_flow.h" -#include "kernel/integrator/integrator_state_util.h" - -#include "kernel/integrator/integrator_intersect_closest.h" -#include "kernel/integrator/integrator_intersect_shadow.h" -#include "kernel/integrator/integrator_intersect_subsurface.h" -#include "kernel/integrator/integrator_intersect_volume_stack.h" +#include "kernel/integrator/state.h" +#include "kernel/integrator/state_flow.h" +#include "kernel/integrator/state_util.h" + +#include "kernel/integrator/intersect_closest.h" +#include "kernel/integrator/intersect_shadow.h" +#include "kernel/integrator/intersect_subsurface.h" +#include "kernel/integrator/intersect_volume_stack.h" // clang-format on |