[Bf-blender-cvs] [cd3fade2aaf] master: Fix Cycles rendering crash on OpenBSD
Brecht Van Lommel
noreply at git.blender.org
Mon Mar 15 16:47:16 CET 2021
Commit: cd3fade2aaf74d1c3db345c13bd0122dc45d372f
Author: Brecht Van Lommel
Date: Mon Mar 15 16:11:12 2021 +0100
Branches: master
https://developer.blender.org/rBcd3fade2aaf74d1c3db345c13bd0122dc45d372f
Fix Cycles rendering crash on OpenBSD
Static initialization order was not guaranteed to be correct for node base
types. Now wrap all initialization in accessor functions to ensure the order
is correct.
Did not cause any known bug on Linux/macOS/Windows, but showed up on this
platform.
===================================================================
M intern/cycles/graph/node_type.cpp
M intern/cycles/graph/node_type.h
M intern/cycles/graph/node_xml.cpp
M intern/cycles/render/alembic.cpp
M intern/cycles/render/background.cpp
M intern/cycles/render/camera.cpp
M intern/cycles/render/film.cpp
M intern/cycles/render/geometry.cpp
M intern/cycles/render/hair.cpp
M intern/cycles/render/integrator.cpp
M intern/cycles/render/light.cpp
M intern/cycles/render/mesh.cpp
M intern/cycles/render/nodes.cpp
M intern/cycles/render/object.cpp
M intern/cycles/render/particles.cpp
M intern/cycles/render/shader.cpp
M intern/cycles/render/volume.cpp
===================================================================
diff --git a/intern/cycles/graph/node_type.cpp b/intern/cycles/graph/node_type.cpp
index d1eadf21b1b..4efbd6725ee 100644
--- a/intern/cycles/graph/node_type.cpp
+++ b/intern/cycles/graph/node_type.cpp
@@ -154,7 +154,7 @@ void NodeType::register_input(ustring name,
int struct_offset,
const void *default_value,
const NodeEnum *enum_values,
- const NodeType **node_type,
+ const NodeType *node_type,
int flags,
int extra_flags)
{
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index 3b9b3007099..2a741d9b06f 100644
--- a/intern/cycles/graph/node_type.h
+++ b/intern/cycles/graph/node_type.h
@@ -87,7 +87,7 @@ struct SocketType {
int struct_offset;
const void *default_value;
const NodeEnum *enum_values;
- const NodeType **node_type;
+ const NodeType *node_type;
int flags;
ustring ui_name;
SocketModifiedFlags modified_flag_bit;
@@ -115,7 +115,7 @@ struct NodeType {
int struct_offset,
const void *default_value,
const NodeEnum *enum_values = NULL,
- const NodeType **node_type = NULL,
+ const NodeType *node_type = NULL,
int flags = 0,
int extra_flags = 0);
void register_output(ustring name, ustring ui_name, SocketType::Type type);
@@ -140,27 +140,38 @@ struct NodeType {
static unordered_map<ustring, NodeType, ustringHash> &types();
};
-/* Node Definition Macros */
+/* Node Definition Macros
+ *
+ * Node we use accessor to get node types to ensure correct static
+ * initialization order. */
#define NODE_DECLARE \
+ static const NodeType *get_node_type(); \
template<typename T> static const NodeType *register_type(); \
- static Node *create(const NodeType *type); \
- static const NodeType *node_type;
+ static Node *create(const NodeType *type);
#define NODE_DEFINE(structname) \
- const NodeType *structname::node_type = structname::register_type<structname>(); \
Node *structname::create(const NodeType *) \
{ \
return new structname(); \
} \
+ const NodeType *structname::get_node_type() \
+ { \
+ static const NodeType *node_type = register_type<structname>(); \
+ return node_type; \
+ } \
template<typename T> const NodeType *structname::register_type()
#define NODE_ABSTRACT_DECLARE \
template<typename T> static const NodeType *register_base_type(); \
- static const NodeType *node_base_type;
+ static const NodeType *get_node_base_type();
#define NODE_ABSTRACT_DEFINE(structname) \
- const NodeType *structname::node_base_type = structname::register_base_type<structname>(); \
+ const NodeType *structname::get_node_base_type() \
+ { \
+ static const NodeType *node_base_type = register_base_type<structname>(); \
+ return node_base_type; \
+ } \
template<typename T> const NodeType *structname::register_base_type()
/* Sock Definition Macros */
diff --git a/intern/cycles/graph/node_xml.cpp b/intern/cycles/graph/node_xml.cpp
index d333400cc4a..43462662b6a 100644
--- a/intern/cycles/graph/node_xml.cpp
+++ b/intern/cycles/graph/node_xml.cpp
@@ -200,7 +200,7 @@ void xml_read_node(XMLReader &reader, Node *node, xml_node xml_node)
map<ustring, Node *>::iterator it = reader.node_map.find(value);
if (it != reader.node_map.end()) {
Node *value_node = it->second;
- if (value_node->is_a(*(socket.node_type)))
+ if (value_node->is_a(socket.node_type))
node->set(socket, it->second);
}
break;
@@ -215,7 +215,7 @@ void xml_read_node(XMLReader &reader, Node *node, xml_node xml_node)
map<ustring, Node *>::iterator it = reader.node_map.find(ustring(tokens[i]));
if (it != reader.node_map.end()) {
Node *value_node = it->second;
- value[i] = (value_node->is_a(*(socket.node_type))) ? value_node : NULL;
+ value[i] = (value_node->is_a(socket.node_type)) ? value_node : NULL;
}
else {
value[i] = NULL;
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 0841a3c09cd..e4f0690c401 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -599,7 +599,7 @@ NODE_DEFINE(AlembicObject)
NodeType *type = NodeType::add("alembic_object", create);
SOCKET_STRING(path, "Alembic Path", ustring());
- SOCKET_NODE_ARRAY(used_shaders, "Used Shaders", &Shader::node_type);
+ SOCKET_NODE_ARRAY(used_shaders, "Used Shaders", Shader::get_node_type());
SOCKET_INT(subd_max_level, "Max Subdivision Level", 1);
SOCKET_FLOAT(subd_dicing_rate, "Subdivision Dicing Rate", 1.0f);
@@ -609,7 +609,7 @@ NODE_DEFINE(AlembicObject)
return type;
}
-AlembicObject::AlembicObject() : Node(node_type)
+AlembicObject::AlembicObject() : Node(get_node_type())
{
schema_type = INVALID;
}
@@ -1320,12 +1320,12 @@ NODE_DEFINE(AlembicProcedural)
SOCKET_FLOAT(default_radius, "Default Radius", 0.01f);
SOCKET_FLOAT(scale, "Scale", 1.0f);
- SOCKET_NODE_ARRAY(objects, "Objects", &AlembicObject::node_type);
+ SOCKET_NODE_ARRAY(objects, "Objects", AlembicObject::get_node_type());
return type;
}
-AlembicProcedural::AlembicProcedural() : Procedural(node_type)
+AlembicProcedural::AlembicProcedural() : Procedural(get_node_type())
{
objects_loaded = false;
scene_ = nullptr;
diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp
index 1303f894912..b3d383afae4 100644
--- a/intern/cycles/render/background.cpp
+++ b/intern/cycles/render/background.cpp
@@ -47,12 +47,12 @@ NODE_DEFINE(Background)
SOCKET_FLOAT(volume_step_size, "Volume Step Size", 0.1f);
- SOCKET_NODE(shader, "Shader", &Shader::node_type);
+ SOCKET_NODE(shader, "Shader", Shader::get_node_type());
return type;
}
-Background::Background() : Node(node_type)
+Background::Background() : Node(get_node_type())
{
shader = NULL;
}
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index afe788eb4be..327f166f9d8 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -163,7 +163,7 @@ NODE_DEFINE(Camera)
return type;
}
-Camera::Camera() : Node(node_type)
+Camera::Camera() : Node(get_node_type())
{
shutter_table_offset = TABLE_OFFSET_INVALID;
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 9b7657802d6..c4ff89fc838 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -96,7 +96,7 @@ NODE_DEFINE(Pass)
return type;
}
-Pass::Pass() : Node(node_type)
+Pass::Pass() : Node(get_node_type())
{
}
@@ -407,7 +407,7 @@ NODE_DEFINE(Film)
return type;
}
-Film::Film() : Node(node_type)
+Film::Film() : Node(get_node_type())
{
use_light_visibility = false;
filter_table_offset = TABLE_OFFSET_INVALID;
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index de0e06828bc..537f3d98c5c 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -52,7 +52,7 @@ NODE_ABSTRACT_DEFINE(Geometry)
SOCKET_UINT(motion_steps, "Motion Steps", 3);
SOCKET_BOOLEAN(use_motion_blur, "Use Motion Blur", false);
- SOCKET_NODE_ARRAY(used_shaders, "Shaders", &Shader::node_type);
+ SOCKET_NODE_ARRAY(used_shaders, "Shaders", Shader::get_node_type());
return type;
}
diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp
index 28ad8a1461a..dad235aa340 100644
--- a/intern/cycles/render/hair.cpp
+++ b/intern/cycles/render/hair.cpp
@@ -283,7 +283,7 @@ void Hair::Curve::cardinal_keys_for_step(const float3 *curve_keys,
NODE_DEFINE(Hair)
{
- NodeType *type = NodeType::add("hair", create, NodeType::NONE, Geometry::node_base_type);
+ NodeType *type = NodeType::add("hair", create, NodeType::NONE, Geometry::get_node_base_type());
SOCKET_POINT_ARRAY(curve_keys, "Curve Keys", array<float3>());
SOCKET_FLOAT_ARRAY(curve_radius, "Curve Radius", array<float>());
@@ -293,7 +293,7 @@ NODE_DEFINE(Hair)
return type;
}
-Hair::Hair() : Geometry(node_type, Geometry::HAIR)
+Hair::Hair() : Geometry(get_node_type(), Geometry::HAIR)
{
curvekey_offset = 0;
curve_shape = CURVE_RIBBON;
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index d93856ceb61..d8749cec9fa 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -96,7 +96,7 @@ NODE_DEFINE(Integrator)
return type;
}
-Integrator::Integrator() : Node(node_type)
+Integrator::Integrator() : Node(get_node_type())
{
}
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index d1e64e2ac14..72450e2c546 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -151,12 +151,12 @@ NODE_DEFINE(Light)
SOCKET_BOOLEAN(is_portal, "Is Portal", false);
SOCKET_BOOLEAN(is_enabled, "Is Enabled", true);
- SOCKET_NODE(shader, "Shader", &Shader::node_type);
+ SOCKET_NODE(shader, "Shader", Shader::get_node_type());
return type;
}
-Light::Light() : Node(node_type)
+Light::Light() : Node(get_node_type())
{
}
@@ -609,7 +609,7 @@ void LightManager::device_update_background(Device *device,
Shader *shader = scene->background->get_shader(scene);
int num_suns = 0;
foreach (ShaderNode *node, shader->graph->nodes) {
- if (node->type == EnvironmentTextureNode::node_type) {
+ if (node->type == EnvironmentTextureNode::get_node_type()) {
EnvironmentTextureNode *env = (EnvironmentTextureNode *)node;
ImageMetaData metadata;
if (!env->handle.empty()) {
@@ -618,7 +618,7 @@ void LightManager::device_update_background(Device *device,
environment_res.y = max(environment_res.y, metadata.height);
}
}
- if (node->type == SkyTextureNode::node_type) {
+ if (node->type == SkyTextureNode::get_node_type()) {
SkyTextureNode *sky = (SkyTextureNode *)node;
if (sky->ge
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list