[Bf-blender-cvs] [1f41bdc6f37] master: Eevee Cryptomatte: Store hashes in render result meta data
Jeroen Bakker
noreply at git.blender.org
Tue Jan 5 15:03:38 CET 2021
Commit: 1f41bdc6f37fd091bb5649436f68335b10ade51f
Author: Jeroen Bakker
Date: Tue Jan 5 14:59:45 2021 +0100
Branches: master
https://developer.blender.org/rB1f41bdc6f37fd091bb5649436f68335b10ade51f
Eevee Cryptomatte: Store hashes in render result meta data
Stores cryptomatte hashes as meta data to the render result. Compositors could
use this for lookup on names in stead of hashes.
Differential Revision: https://developer.blender.org/D9553
===================================================================
M source/blender/blenkernel/BKE_cryptomatte.h
M source/blender/blenkernel/intern/cryptomatte.cc
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/eevee/eevee_cryptomatte.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/eevee/eevee_render.c
M source/blender/draw/engines/eevee/eevee_renderpasses.c
M source/blender/draw/engines/external/external_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/image/image_engine.c
M source/blender/draw/engines/overlay/overlay_engine.c
M source/blender/draw/engines/select/select_engine.c
M source/blender/draw/engines/workbench/workbench_engine.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index 433c25084ad..3abaf5256df 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -24,19 +24,30 @@
#pragma once
#include "BLI_sys_types.h"
+#include "DNA_layer_types.h"
#ifdef __cplusplus
extern "C" {
#endif
-struct Main;
+struct CryptomatteSession;
struct Material;
+struct ID;
+struct Main;
struct Object;
+struct RenderResult;
+
+struct CryptomatteSession *BKE_cryptomatte_init(void);
+void BKE_cryptomatte_finish(struct CryptomatteSession *session);
+void BKE_cryptomatte_free(struct CryptomatteSession *session);
uint32_t BKE_cryptomatte_hash(const char *name, int name_len);
-uint32_t BKE_cryptomatte_object_hash(const struct Object *object);
-uint32_t BKE_cryptomatte_material_hash(const struct Material *material);
-uint32_t BKE_cryptomatte_asset_hash(const struct Object *object);
+uint32_t BKE_cryptomatte_object_hash(struct CryptomatteSession *session,
+ const struct Object *object);
+uint32_t BKE_cryptomatte_material_hash(struct CryptomatteSession *session,
+ const struct Material *material);
+uint32_t BKE_cryptomatte_asset_hash(struct CryptomatteSession *session,
+ const struct Object *object);
float BKE_cryptomatte_hash_to_float(uint32_t cryptomatte_hash);
char *BKE_cryptomatte_entries_to_matte_id(struct NodeCryptomatte *node_storage);
@@ -44,6 +55,12 @@ void BKE_cryptomatte_matte_id_to_entries(const struct Main *bmain,
struct NodeCryptomatte *node_storage,
const char *matte_id);
+void BKE_cryptomatte_store_metadata(struct CryptomatteSession *session,
+ struct RenderResult *render_result,
+ const ViewLayer *view_layer,
+ eViewLayerCryptomatteFlags cryptomatte_layer,
+ const char *cryptomatte_layer_name);
+
#ifdef __cplusplus
}
-#endif
+#endif
\ No newline at end of file
diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc
index 4bbeb088628..3ed66960162 100644
--- a/source/blender/blenkernel/intern/cryptomatte.cc
+++ b/source/blender/blenkernel/intern/cryptomatte.cc
@@ -22,8 +22,10 @@
*/
#include "BKE_cryptomatte.h"
+#include "BKE_image.h"
#include "BKE_main.h"
+#include "DNA_layer_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
@@ -32,48 +34,142 @@
#include "BLI_dynstr.h"
#include "BLI_hash_mm3.h"
#include "BLI_listbase.h"
+#include "BLI_set.hh"
#include "BLI_string.h"
#include "MEM_guardedalloc.h"
#include <cstring>
+#include <iomanip>
#include <sstream>
#include <string>
-static uint32_t cryptomatte_hash(const ID *id)
+enum CryptomatteLayerState {
+ EMPTY,
+ FILLED,
+ CLOSED,
+};
+
+struct CryptomatteLayer {
+ CryptomatteLayerState state = CryptomatteLayerState::EMPTY;
+ blender::Set<std::string> names;
+ std::stringstream manifest;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("cryptomatte:CryptomatteLayer")
+#endif
+
+ void add_hash(std::string name, uint32_t cryptomatte_hash)
+ {
+ BLI_assert(state != CryptomatteLayerState::CLOSED);
+ const bool first_item = names.is_empty();
+ if (!names.add(name)) {
+ return;
+ }
+
+ if (first_item) {
+ state = CryptomatteLayerState::FILLED;
+ manifest << "{";
+ }
+ else {
+ manifest << ",";
+ }
+ manifest << quoted(name) << ":\"";
+ manifest << std::setfill('0') << std::setw(sizeof(uint32_t) * 2) << std::hex
+ << cryptomatte_hash;
+ manifest << "\"";
+ }
+
+ void close_manifest()
+ {
+ BLI_assert(state != CryptomatteLayerState::CLOSED);
+ if (state == CryptomatteLayerState::FILLED) {
+ manifest << "}";
+ }
+ state = CryptomatteLayerState::CLOSED;
+ }
+
+ std::string manifest_get_string()
+ {
+ BLI_assert(state == CryptomatteLayerState::CLOSED);
+ return manifest.str();
+ }
+};
+
+struct CryptomatteSession {
+ CryptomatteLayer objects;
+ CryptomatteLayer assets;
+ CryptomatteLayer materials;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("cryptomatte:CryptomatteSession")
+#endif
+
+ void finish()
+ {
+ objects.close_manifest();
+ materials.close_manifest();
+ assets.close_manifest();
+ }
+};
+
+CryptomatteSession *BKE_cryptomatte_init(void)
{
- const char *name = &id->name[2];
- const int name_len = BLI_strnlen(name, MAX_NAME);
- uint32_t cryptohash_int = BKE_cryptomatte_hash(name, name_len);
- return cryptohash_int;
+ CryptomatteSession *session = new CryptomatteSession();
+ return session;
+}
+
+void BKE_cryptomatte_finish(CryptomatteSession *session)
+{
+ BLI_assert(session != NULL);
+ session->finish();
}
-uint32_t BKE_cryptomatte_hash(const char *name, int name_len)
+void BKE_cryptomatte_free(CryptomatteSession *session)
+{
+ BLI_assert(session != NULL);
+ delete session;
+}
+
+uint32_t BKE_cryptomatte_hash(const char *name, const int name_len)
{
uint32_t cryptohash_int = BLI_hash_mm3((const unsigned char *)name, name_len, 0);
return cryptohash_int;
}
-uint32_t BKE_cryptomatte_object_hash(const Object *object)
+static uint32_t cryptomatte_hash(CryptomatteLayer *layer, const ID *id)
{
- return cryptomatte_hash(&object->id);
+ const char *name = &id->name[2];
+ const int name_len = BLI_strnlen(name, MAX_NAME - 2);
+ uint32_t cryptohash_int = BKE_cryptomatte_hash(name, name_len);
+
+ if (layer != nullptr) {
+ layer->add_hash(std::string(name, name_len), cryptohash_int);
+ }
+
+ return cryptohash_int;
}
-uint32_t BKE_cryptomatte_material_hash(const Material *material)
+uint32_t BKE_cryptomatte_object_hash(CryptomatteSession *session, const Object *object)
{
- if (material == nullptr) {
+ return cryptomatte_hash(&session->objects, &object->id);
+}
+
+uint32_t BKE_cryptomatte_material_hash(CryptomatteSession *session, const Material *material)
+{
+ if (material == NULL) {
return 0.0f;
}
- return cryptomatte_hash(&material->id);
+ return cryptomatte_hash(&session->materials, &material->id);
}
-uint32_t BKE_cryptomatte_asset_hash(const Object *object)
+uint32_t BKE_cryptomatte_asset_hash(CryptomatteSession *session, const Object *object)
{
const Object *asset_object = object;
- while (asset_object->parent != nullptr) {
+ while (asset_object->parent != NULL) {
asset_object = asset_object->parent;
}
- return cryptomatte_hash(&asset_object->id);
+ return cryptomatte_hash(&session->assets, &asset_object->id);
}
/* Convert a cryptomatte hash to a float.
@@ -187,4 +283,64 @@ void BKE_cryptomatte_matte_id_to_entries(const Main *bmain,
BLI_addtail(&node_storage->entries, entry);
}
}
-}
\ No newline at end of file
+}
+
+static std::string cryptomatte_determine_name(const ViewLayer *view_layer,
+ const std::string cryptomatte_layer_name)
+{
+ std::stringstream stream;
+ const size_t view_layer_name_len = BLI_strnlen(view_layer->name, sizeof(view_layer->name));
+ stream << std::string(view_layer->name, view_layer_name_len) << "." << cryptomatte_layer_name;
+ return stream.str();
+}
+
+static uint32_t cryptomatte_determine_identifier(const std::string name)
+{
+ return BLI_hash_mm3(reinterpret_cast<const unsigned char *>(name.c_str()), name.length(), 0);
+}
+
+static std::string cryptomatte_determine_prefix(const std::string name)
+{
+ std::stringstream stream;
+ const uint32_t render_pass_identifier = cryptomatte_determine_identifier(name);
+ stream << "cryptomatte/";
+ stream << std::setfill('0') << std::setw(sizeof(uint32_t) * 2) << std::hex
+ << render_pass_identifier;
+ stream << "/";
+ return stream.str();
+}
+
+void BKE_cryptomatte_store_metadata(struct CryptomatteSession *session,
+ RenderResult *render_result,
+ const ViewLayer *view_layer,
+ eViewLayerCryptomatteFlags cryptomatte_layer,
+ const char *cryptomatte_layer_name)
+{
+ /* Create Manifest. */
+ CryptomatteLayer *layer = nullptr;
+ switch (cryptomatte_layer) {
+ case VIEW_LAYER_CRYPTOMATTE_OBJECT:
+ layer = &session->objects;
+ break;
+ case VIEW_LAYER_CRYPTOMATTE_MATERIAL:
+ layer = &session->materials;
+ break;
+ case VIEW_LAYER_CRYPTOMATTE_ASSET:
+ layer = &session->assets;
+ break;
+ default:
+ BLI_assert(!"Incorrect cryptomatte layer");
+ break;
+ }
+
+ const std::string manifest = layer->manifest_get_string();
+ const std::string name = cryptomatte_determine_name(view_layer, cryptomatte_layer_name);
+ const std::string prefix = cryptomatte_determine_prefix(name);
+
+ /* Store the meta data into the render result. */
+ BKE_render_result_stamp_data(render_result, (prefix + "name").c_str(), name.c_str());
+ BKE_render_result_stamp_data(render_result, (prefix + "hash").c_str(), "MurmurHash3_32");
+ BKE_render_result_stamp_data(
+ render_result, (prefix + "conversion").c_str(), "uint32_to_float32");
+ BKE_render_result_stamp_data(render_result, (prefix + "manifest").c_str(), manifest.c_str());
+}
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index a152f90e2c5..c120df7e897 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -260,6 +260,7 @@ DrawEngineType draw_engine_basic_type = {
NULL,
NULL,
NULL,
+ NULL,
};
#undef BASIC_ENGINE
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index 9150de7184a..ce714715c6c 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -125,6 +125,7 @@ void EEVEE_cryptomatte_renderp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list