f03ac5ec4b
Update use_shading, use_camera and the shading system pointers in the same location, so that when the render is interrupted they are in a consistent state. The added null pointer checks are not strictly needed, but just in case it goes out of sync for another reason. Pull Request: https://projects.blender.org/blender/blender/pulls/143467
66 lines
1.7 KiB
C++
66 lines
1.7 KiB
C++
/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#include <cstdint> /* Needed before `sdlexec.h` for `int32_t` with GCC 15.1. */
|
|
|
|
#include <OSL/oslexec.h>
|
|
|
|
#include "kernel/osl/globals.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
OSLThreadData::OSLThreadData(OSLGlobals *osl_globals, const int thread_index)
|
|
: globals(osl_globals), thread_index(thread_index)
|
|
{
|
|
/* If OSL is not used, we don't need this. */
|
|
if (globals == nullptr || !(globals->use_shading || globals->use_camera)) {
|
|
return;
|
|
}
|
|
|
|
ss = globals->ss;
|
|
|
|
memset((void *)&shader_globals, 0, sizeof(shader_globals));
|
|
shader_globals.tracedata = &tracedata;
|
|
|
|
if (ss) {
|
|
osl_thread_info = ss->create_thread_info();
|
|
context = ss->get_context(osl_thread_info);
|
|
}
|
|
if (globals->ts) {
|
|
oiio_thread_info = globals->ts->get_perthread_info();
|
|
}
|
|
}
|
|
|
|
OSLThreadData::~OSLThreadData()
|
|
{
|
|
if (context) {
|
|
ss->release_context(context);
|
|
}
|
|
if (osl_thread_info) {
|
|
ss->destroy_thread_info(osl_thread_info);
|
|
}
|
|
}
|
|
|
|
OSLThreadData::OSLThreadData(OSLThreadData &&other) noexcept
|
|
: globals(other.globals),
|
|
ss(other.ss),
|
|
thread_index(other.thread_index),
|
|
shader_globals(other.shader_globals),
|
|
tracedata(other.tracedata),
|
|
osl_thread_info(other.osl_thread_info),
|
|
context(other.context),
|
|
oiio_thread_info(other.oiio_thread_info)
|
|
{
|
|
shader_globals.tracedata = &tracedata;
|
|
|
|
memset((void *)&other.shader_globals, 0, sizeof(other.shader_globals));
|
|
memset((void *)&other.tracedata, 0, sizeof(other.tracedata));
|
|
other.thread_index = -1;
|
|
other.context = nullptr;
|
|
other.osl_thread_info = nullptr;
|
|
other.oiio_thread_info = nullptr;
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|