[Bf-blender-cvs] [8f710b104d3] temp-geometry-nodes-evaluator-refactor: cleanup logger naming
Jacques Lucke
noreply at git.blender.org
Thu Jun 30 23:32:38 CEST 2022
Commit: 8f710b104d3d659041b5161a08eb1a9521e3ccc7
Author: Jacques Lucke
Date: Thu Jun 30 22:27:09 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rB8f710b104d3d659041b5161a08eb1a9521e3ccc7
cleanup logger naming
===================================================================
M source/blender/editors/space_node/node_draw.cc
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/nodes/NOD_geometry_exec.hh
M source/blender/nodes/NOD_geometry_nodes_log.hh
M source/blender/nodes/NOD_geometry_nodes_to_lazy_function_graph.hh
M source/blender/nodes/intern/geometry_nodes_log.cc
M source/blender/nodes/intern/node_geometry_exec.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 99c2c0bb5f7..eb9949ec4a1 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -79,13 +79,13 @@
using blender::GPointer;
using blender::Vector;
using blender::fn::GField;
-using blender::nodes::geo_eval_log::GeoNodesModifierEvalLog;
-using blender::nodes::geo_eval_log::GeoNodesTreeEvalLog;
+using blender::nodes::geo_eval_log::GeoModifierLog;
+using blender::nodes::geo_eval_log::GeoNodeLog;
+using blender::nodes::geo_eval_log::GeoTreeLog;
+using blender::nodes::geo_eval_log::GeoTreeLogger;
using blender::nodes::geo_eval_log::NamedAttributeUsage;
using blender::nodes::geo_eval_log::NodeWarning;
using blender::nodes::geo_eval_log::NodeWarningType;
-using blender::nodes::geo_eval_log::ReducedGeoNodeEvalLog;
-using blender::nodes::geo_eval_log::ReducedGeoNodesTreeEvalLog;
extern "C" {
/* XXX interface.h */
@@ -94,7 +94,7 @@ extern void ui_draw_dropshadow(
}
struct TreeDrawContext {
- ReducedGeoNodesTreeEvalLog *geo_nodes_eval_log = nullptr;
+ GeoTreeLog *geo_tree_log = nullptr;
};
float ED_node_grid_size()
@@ -1551,7 +1551,7 @@ static char *node_errors_tooltip_fn(bContext *UNUSED(C), void *argN, const char
return BLI_strdupn(complete_string.c_str(), complete_string.size());
}
-static ReducedGeoNodesTreeEvalLog *get_reduced_geo_nodes_eval_log(SpaceNode &snode)
+static GeoTreeLog *get_geo_tree_log(SpaceNode &snode)
{
using namespace blender;
using namespace blender::nodes;
@@ -1583,8 +1583,7 @@ static ReducedGeoNodesTreeEvalLog *get_reduced_geo_nodes_eval_log(SpaceNode &sno
if (nmd->runtime_eval_log == nullptr) {
return nullptr;
}
- GeoNodesModifierEvalLog &eval_log = *static_cast<GeoNodesModifierEvalLog *>(
- nmd->runtime_eval_log);
+ GeoModifierLog &modifier_log = *static_cast<GeoModifierLog *>(nmd->runtime_eval_log);
contexts.append(allocator.construct<ModifierContextStack>(nullptr, nmd->modifier.name));
Vector<const bNodeTreePath *> tree_path_vec{snode.treepath};
if (tree_path_vec.is_empty()) {
@@ -1596,7 +1595,7 @@ static ReducedGeoNodesTreeEvalLog *get_reduced_geo_nodes_eval_log(SpaceNode &sno
}
const ContextStack &final_context = *contexts.last();
- return &eval_log.get_reduced_tree_log(final_context.hash());
+ return &modifier_log.get_tree_log(final_context.hash());
}
#define NODE_HEADER_ICON_SIZE (0.8f * U.widget_unit)
@@ -1612,11 +1611,10 @@ static void node_add_error_message_button(const bContext &C,
UNUSED_VARS(snode, node);
Span<NodeWarning> warnings;
- if (tree_draw_ctx.geo_nodes_eval_log) {
- ReducedGeoNodeEvalLog *node_eval_log = tree_draw_ctx.geo_nodes_eval_log->nodes.lookup_ptr(
- node.name);
- if (node_eval_log != nullptr) {
- warnings = node_eval_log->warnings;
+ if (tree_draw_ctx.geo_tree_log) {
+ GeoNodeLog *node_log = tree_draw_ctx.geo_tree_log->nodes.lookup_ptr(node.name);
+ if (node_log != nullptr) {
+ warnings = node_log->warnings;
}
}
if (warnings.is_empty()) {
@@ -3013,9 +3011,9 @@ static void draw_nodetree(const bContext &C,
TreeDrawContext tree_draw_ctx;
if (ntree.type == NTREE_GEOMETRY) {
- tree_draw_ctx.geo_nodes_eval_log = get_reduced_geo_nodes_eval_log(*snode);
- if (tree_draw_ctx.geo_nodes_eval_log != nullptr) {
- tree_draw_ctx.geo_nodes_eval_log->ensure_node_warnings();
+ tree_draw_ctx.geo_tree_log = get_geo_tree_log(*snode);
+ if (tree_draw_ctx.geo_tree_log != nullptr) {
+ tree_draw_ctx.geo_tree_log->ensure_node_warnings();
}
}
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 03b593375be..96b3c3c0085 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -117,17 +117,17 @@ using blender::fn::ValueOrFieldCPPType;
using blender::nodes::FieldInferencingInterface;
using blender::nodes::GeoNodeExecParams;
using blender::nodes::InputSocketFieldType;
-using blender::nodes::geo_eval_log::GeoNodesModifierEvalLog;
+using blender::nodes::geo_eval_log::GeoModifierLog;
using blender::threading::EnumerableThreadSpecific;
using namespace blender::fn::lazy_function_graph_types;
using namespace blender::fn::multi_function_types;
using namespace blender::nodes::derived_node_tree_types;
using blender::nodes::geo_eval_log::GeometryAttributeInfo;
+using blender::nodes::geo_eval_log::GeoNodeLog;
+using blender::nodes::geo_eval_log::GeoTreeLog;
using blender::nodes::geo_eval_log::NamedAttributeUsage;
using blender::nodes::geo_eval_log::NodeWarning;
using blender::nodes::geo_eval_log::NodeWarningType;
-using blender::nodes::geo_eval_log::ReducedGeoNodeEvalLog;
-using blender::nodes::geo_eval_log::ReducedGeoNodesTreeEvalLog;
static void initData(ModifierData *md)
{
@@ -916,7 +916,7 @@ static void find_sockets_to_preview(NodesModifierData *nmd,
static void clear_runtime_data(NodesModifierData *nmd)
{
if (nmd->runtime_eval_log != nullptr) {
- delete static_cast<GeoNodesModifierEvalLog *>(nmd->runtime_eval_log);
+ delete static_cast<GeoModifierLog *>(nmd->runtime_eval_log);
nmd->runtime_eval_log = nullptr;
}
}
@@ -1113,7 +1113,7 @@ static GeometrySet compute_geometry(const NodeTreeRef &tree_ref,
geo_nodes_modifier_data.depsgraph = ctx->depsgraph;
geo_nodes_modifier_data.self_object = ctx->object;
/* TODO: Only use logging when enabled. */
- auto eval_log = std::make_unique<GeoNodesModifierEvalLog>();
+ auto eval_log = std::make_unique<GeoModifierLog>();
geo_nodes_modifier_data.eval_log = eval_log.get();
blender::nodes::GeoNodesLFUserData user_data;
user_data.modifier_data = &geo_nodes_modifier_data;
@@ -1175,7 +1175,7 @@ static GeometrySet compute_geometry(const NodeTreeRef &tree_ref,
if (logging_enabled(ctx)) {
NodesModifierData *nmd_orig = reinterpret_cast<NodesModifierData *>(
BKE_modifier_get_original(ctx->object, &nmd->modifier));
- delete static_cast<GeoNodesModifierEvalLog *>(nmd_orig->runtime_eval_log);
+ delete static_cast<GeoModifierLog *>(nmd_orig->runtime_eval_log);
nmd_orig->runtime_eval_log = eval_log.release();
}
@@ -1638,11 +1638,11 @@ static void panel_draw(const bContext *C, Panel *panel)
/* Draw node warnings. */
if (nmd->runtime_eval_log != nullptr) {
- GeoNodesModifierEvalLog &log = *static_cast<GeoNodesModifierEvalLog *>(nmd->runtime_eval_log);
+ GeoModifierLog &modifier_log = *static_cast<GeoModifierLog *>(nmd->runtime_eval_log);
blender::nodes::ModifierContextStack context_stack{nullptr, nmd->modifier.name};
- ReducedGeoNodesTreeEvalLog &reduced_tree_log = log.get_reduced_tree_log(context_stack.hash());
- reduced_tree_log.ensure_node_warnings();
- for (const NodeWarning &warning : reduced_tree_log.all_warnings) {
+ GeoTreeLog &tree_log = modifier_log.get_tree_log(context_stack.hash());
+ tree_log.ensure_node_warnings();
+ for (const NodeWarning &warning : tree_log.all_warnings) {
if (warning.type != NodeWarningType::Info) {
uiItemL(layout, warning.message.c_str(), ICON_ERROR);
}
diff --git a/source/blender/nodes/NOD_geometry_exec.hh b/source/blender/nodes/NOD_geometry_exec.hh
index dc55924c6ff..bfec2109e2c 100644
--- a/source/blender/nodes/NOD_geometry_exec.hh
+++ b/source/blender/nodes/NOD_geometry_exec.hh
@@ -139,7 +139,7 @@ class GeoNodeExecParams {
const int index = this->get_output_index(identifier);
const bNodeSocket *socket = node_.output_by_identifier(identifier).bsocket();
- geo_eval_log::GeoNodesTreeEvalLog &tree_log = this->get_local_log();
+ geo_eval_log::GeoTreeLogger &tree_log = this->get_local_tree_logger();
StoredT *logged_value = static_cast<StoredT *>(
tree_log.allocator.allocate(sizeof(StoredT), alignof(StoredT)));
new (logged_value) StoredT(value);
@@ -152,13 +152,13 @@ class GeoNodeExecParams {
}
}
- geo_eval_log::GeoNodesTreeEvalLog &get_local_log() const
+ geo_eval_log::GeoTreeLogger &get_local_tree_logger() const
{
GeoNodesLFUserData *user_data = this->user_data();
BLI_assert(user_data != nullptr);
const ContextStack *context_stack = user_data->context_stack;
BLI_assert(context_stack != nullptr);
- return user_data->modifier_data->eval_log->get_local_log(*context_stack);
+ return user_data->modifier_data->eval_log->get_local_tree_logger(*context_stack);
}
/**
diff --git a/source/blender/nodes/NOD_geometry_nodes_log.hh b/source/blender/nodes/NOD_geometry_nodes_log.hh
index e6dff630f19..66a73e5674d 100644
--- a/source/blender/nodes/NOD_geometry_nodes_log.hh
+++ b/source/blender/nodes/NOD_geometry_nodes_log.hh
@@ -64,7 +64,7 @@ struct GeometryAttributeInfo {
std::optional<eCustomDataType> data_type;
};
-class GeoNodesTreeEvalLog {
+class GeoTreeLogger {
public:
std::optional<ContextStackHash> parent_hash;
std::optional<std::string> group_node_name;
@@ -77,41 +77,40 @@ class GeoNodesTreeEvalLog {
Vector<std::tuple<std::string, std::string, ValueLog *>> output_socket_values;
};
-class ReducedGeoNodeEvalLog {
+class GeoNodeLog {
public:
Vector<NodeWarning> warnings;
};
-class GeoNodesModifierEvalLog;
+class GeoModifierLog;
-class ReducedGeoNodesTreeEvalLog {
+class GeoTreeLog {
private:
- GeoNodesModifierEvalLog *full_log_;
- Vector<GeoNodesTreeEvalLog *> tree_logs_;
+ GeoModifierLog *modifier_log_;
+ Vector<GeoTreeLogger *> tree_loggers_;
bool reduced_node_warnings_ = false;
public:
- Map<std::string, ReducedGeoNodeEvalLog> nodes;
+ Map<std::string, GeoNodeLog> nodes;
Vector<NodeWarning> all_warnings;
- ReducedGeoNodesTreeEvalLog(GeoNodesModifierEvalLog *full_log,
- Vector<GeoNodesTreeEvalLog *> tree_logs)
- : full_log_(full_log), tree_logs_(std::move(tree_logs))
+ GeoTreeLog(GeoModifierLog *modifier_log, Vector<GeoTreeLogger *> tree_loggers)
+ : modifier_log_(modifier_log), tree_loggers_(std::move(tree_loggers))
{
}
void ensure_node_warnings();
};
-class GeoNodesModifierEvalLog {
+class GeoModifierLog {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list