diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
| commit | b2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1 (patch) | |
| tree | f94394835c6b731e4e379f4ef48fb78b4af4b9ca /intern/cycles/device/cpu/kernel_thread_globals.cpp | |
| parent | b31807c75f0c18c43ac6979e6da57dc9d420167a (diff) | |
| parent | 7e980f2b8cb96aa6d04dc72899d08473367eeeb9 (diff) | |
Merge branch 'master' into tmp-usd-alab-v2-T100452tmp-usd-alab-v2-T100452
Diffstat (limited to 'intern/cycles/device/cpu/kernel_thread_globals.cpp')
| -rw-r--r-- | intern/cycles/device/cpu/kernel_thread_globals.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp index 89545399602..99af1525d92 100644 --- a/intern/cycles/device/cpu/kernel_thread_globals.cpp +++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp @@ -3,10 +3,7 @@ #include "device/cpu/kernel_thread_globals.h" -// clang-format off -#include "kernel/osl/shader.h" #include "kernel/osl/globals.h" -// clang-format on #include "util/profiling.h" @@ -20,7 +17,7 @@ CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_gl reset_runtime_memory(); #ifdef WITH_OSL - OSLShader::thread_init(this, reinterpret_cast<OSLGlobals *>(osl_globals_memory)); + OSLGlobals::thread_init(this, static_cast<OSLGlobals *>(osl_globals_memory)); #else (void)osl_globals_memory; #endif @@ -35,7 +32,7 @@ CPUKernelThreadGlobals::CPUKernelThreadGlobals(CPUKernelThreadGlobals &&other) n CPUKernelThreadGlobals::~CPUKernelThreadGlobals() { #ifdef WITH_OSL - OSLShader::thread_free(this); + OSLGlobals::thread_free(this); #endif } |