diff options
| author | Brecht Van Lommel <brecht> | 2021-10-17 17:10:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-18 20:02:10 +0300 |
| commit | 1df3b51988852fa8ee6b530a64aa23346db9acd4 (patch) | |
| tree | dd79dba4c8ff8bb8474cc399e9d1b308d845e0cb /intern/cycles/integrator/shader_eval.cpp | |
| parent | 44c3bb729be42d6d67eaf8918d7cbcb2ff0b315d (diff) | |
Cycles: replace integrator state argument macros
* Rename struct KernelGlobals to struct KernelGlobalsCPU
* Add KernelGlobals, IntegratorState and ConstIntegratorState typedefs
that every device can define in its own way.
* Remove INTEGRATOR_STATE_ARGS and INTEGRATOR_STATE_PASS macros and
replace with these new typedefs.
* Add explicit state argument to INTEGRATOR_STATE and similar macros
In preparation for decoupling main and shadow paths.
Differential Revision: https://developer.blender.org/D12888
Diffstat (limited to 'intern/cycles/integrator/shader_eval.cpp')
| -rw-r--r-- | intern/cycles/integrator/shader_eval.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/integrator/shader_eval.cpp b/intern/cycles/integrator/shader_eval.cpp index 53546c03872..cfc30056f7d 100644 --- a/intern/cycles/integrator/shader_eval.cpp +++ b/intern/cycles/integrator/shader_eval.cpp @@ -113,7 +113,7 @@ bool ShaderEval::eval_cpu(Device *device, } const int thread_index = tbb::this_task_arena::current_thread_index(); - KernelGlobals *kg = &kernel_thread_globals[thread_index]; + const KernelGlobalsCPU *kg = &kernel_thread_globals[thread_index]; switch (type) { case SHADER_EVAL_DISPLACE: |