blender/intern/cycles/kernel/osl/osl_globals.h
Lukas Toenne 95b85a8c37 Revert "Use one context per OSL thread. Not sure if this actually works, but the simple renderer example in OSL does it this way."
This does not actually work: The context must not be shared between threads, but using the same context between different samples actually seems to prevent OSL from switching between shaders. The proper solution would be to ensure memory pooling works correctly.

This reverts commit 69f87e69258d6266dcb20f09f7e3d4021e663432.
2012-09-04 17:28:36 +00:00

78 lines
1.9 KiB
C++

/*
* Copyright 2011, Blender Foundation.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __OSL_GLOBALS_H__
#define __OSL_GLOBALS_H__
#ifdef WITH_OSL
#include <OSL/oslexec.h>
#include "util_map.h"
#include "util_param.h"
#include "util_thread.h"
#include "util_vector.h"
CCL_NAMESPACE_BEGIN
class OSLRenderServices;
struct OSLGlobals {
/* use */
bool use;
/* shading system */
OSL::ShadingSystem *ss;
OSLRenderServices *services;
/* shader states */
vector<OSL::ShadingAttribStateRef> surface_state;
vector<OSL::ShadingAttribStateRef> volume_state;
vector<OSL::ShadingAttribStateRef> displacement_state;
OSL::ShadingAttribStateRef background_state;
/* attributes */
struct Attribute {
TypeDesc type;
AttributeElement elem;
int offset;
ParamValue value;
};
typedef unordered_map<ustring, Attribute, ustringHash> AttributeMap;
typedef unordered_map<ustring, int, ustringHash> ObjectNameMap;
vector<AttributeMap> attribute_map;
ObjectNameMap object_name_map;
/* thread key for thread specific data lookup */
struct ThreadData {
OSL::ShaderGlobals globals;
OSL::PerThreadInfo *thread_info;
};
static tls_ptr(ThreadData, thread_data);
};
CCL_NAMESPACE_END
#endif
#endif /* __OSL_GLOBALS_H__ */