Commit: 76953a6ebd6d595df95277b3e3d5fa37fb1a9462
Author: Sergey Sharybin
Date:   Thu Feb 22 10:52:43 2018 +0100
Branches: master
https://developer.blender.org/rB76953a6ebd6d595df95277b3e3d5fa37fb1a9462

Depsgraph: Add utility class to keep track of handled ID datablocks

Currently unused, actual logic change will come in the next commit.

===================================================================

M       source/blender/depsgraph/CMakeLists.txt
A       source/blender/depsgraph/intern/builder/deg_builder_map.cc
A       source/blender/depsgraph/intern/builder/deg_builder_map.h

===================================================================

diff --git a/source/blender/depsgraph/CMakeLists.txt 
b/source/blender/depsgraph/CMakeLists.txt
index af2c2ecb67f..50c0910ef02 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -42,6 +42,7 @@ set(INC_SYS
 set(SRC
        intern/builder/deg_builder.cc
        intern/builder/deg_builder_cycle.cc
+       intern/builder/deg_builder_map.cc
        intern/builder/deg_builder_nodes.cc
        intern/builder/deg_builder_nodes_rig.cc
        intern/builder/deg_builder_nodes_scene.cc
@@ -77,6 +78,7 @@ set(SRC
 
        intern/builder/deg_builder.h
        intern/builder/deg_builder_cycle.h
+       intern/builder/deg_builder_map.h
        intern/builder/deg_builder_nodes.h
        intern/builder/deg_builder_pchanmap.h
        intern/builder/deg_builder_relations.h
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc 
b/source/blender/depsgraph/intern/builder/deg_builder_map.cc
new file mode 100644
index 00000000000..8c8446c1686
--- /dev/null
+++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc
@@ -0,0 +1,64 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2018 Blender Foundation.
+ * All rights reserved.
+ *
+ * Original Author: Sergey Sharybin
+ * Contributor(s): None Yet
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/depsgraph/intern/builder/deg_builder.cc
+ *  \ingroup depsgraph
+ */
+
+#include "intern/builder/deg_builder_map.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
+
+namespace DEG {
+
+BuilderMap::BuilderMap() {
+       set = BLI_gset_ptr_new("deg builder gset");
+}
+
+
+BuilderMap::~BuilderMap() {
+       BLI_gset_free(set, NULL);
+}
+
+bool BuilderMap::checkIsBuilt(ID *id) {
+       return BLI_gset_haskey(set, id);
+}
+
+void BuilderMap::tagBuild(ID *id) {
+       BLI_gset_insert(set, id);
+}
+
+bool BuilderMap::checkIsBuiltAndTag(ID *id) {
+       void **key_p;
+       if (!BLI_gset_ensure_p_ex(set, id, &key_p)) {
+               *key_p = id;
+               return false;
+       }
+       return true;
+}
+
+}  // namespace DEG
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h 
b/source/blender/depsgraph/intern/builder/deg_builder_map.h
new file mode 100644
index 00000000000..0e6d7c81396
--- /dev/null
+++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h
@@ -0,0 +1,69 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2018 Blender Foundation.
+ * All rights reserved.
+ *
+ * Original Author: Sergey Sharybin
+ * Contributor(s): None Yet
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/depsgraph/intern/builder/deg_builder.h
+ *  \ingroup depsgraph
+ */
+
+#pragma once
+
+struct GSet;
+struct ID;
+
+namespace DEG {
+
+class BuilderMap {
+public:
+       BuilderMap();
+       ~BuilderMap();
+
+       /* Check whether given ID is already handled by builder (or if it's 
being
+        * handled).
+        */
+       bool checkIsBuilt(ID *id);
+
+       /* Tag given ID as handled/built. */
+       void tagBuild(ID *id);
+
+       /* Combination of previous two functions, returns truth if ID was 
already
+        * handled, or tags is handled otherwise and return false.
+        */
+       bool checkIsBuiltAndTag(ID *id);
+
+       template<typename T> bool checkIsBuilt(T *datablock) {
+               return checkIsBuilt(&datablock->id);
+       }
+       template<typename T> void tagBuild(T *datablock) {
+               tagBuild(&datablock->id);
+       }
+       template<typename T> bool checkIsBuiltAndTag(T *datablock) {
+               return checkIsBuiltAndTag(&datablock->id);
+       }
+
+       GSet *set;
+};
+
+}  // namespace DEG

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to