Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jbakker>2020-12-04 10:13:54 +0300
committerJeroen Bakker <jeroen@blender.org>2020-12-04 10:14:07 +0300
commit2bae11d5c08a9095f2c8ec5e465e73ada9840ed1 (patch)
tree1b256d7acff23d763758daa33282b9238ba72f5b /source/blender/blenkernel/intern/layer_test.cc
parent2bd0263fbf2175c672d46c9df9eff7fd3ceecbce (diff)
EEVEE: Arbitrary Output Variables
This patch adds support for AOVs in EEVEE. AOV Outputs can be defined in the render pass tab and used in shader materials. Both Object and World based shaders are supported. The AOV can be previewed in the viewport using the renderpass selector in the shading popover. AOV names that conflict with other AOVs are automatically corrected. AOV conflicts with render passes get a warning icon. The reason behind this is that changing render engines/passes can change the conflict, but you might not notice it. Changing this automatically would also make the materials incorrect, so best to leave this to the user. **Implementation** The patch adds a copies the AOV structures of Cycles into Blender. The goal is that the Cycles will use Blenders AOV defintions. In the Blender kernel (`layer.c`) the logic of these structures are implemented. The GLSL shader of any GPUMaterial can hold multiple outputs (the main output and the AOV outputs) based on the renderPassUBO the right output is selected. This selection uses an hash that encodes the AOV structure. The full AOV needed to be encoded when actually drawing the material pass as the AOV type changes the behavior of the AOV. This isn't known yet when the GLSL is compiled. **Future Developments** * The AOV definitions in the render layer panel isn't shared with Cycles. Cycles should be migrated to use the same viewlayer aovs. During a previous attempt this failed as the AOV validation in cycles and in Blender have implementation differences what made it crash when an aov name was invalid. This could be fixed by extending the external render engine API. * Add support to Cycles to render AOVs in the 3d viewport. * Use a drop down list for selecting AOVs in the AOV Output node. * Give user feedback when multiple AOV output nodes with the same AOV name exists in the same shader. * Fix viewing single channel images in the image editor [T83314] * Reduce viewport render time by only render needed draw passes. [T83316] Reviewed By: Brecht van Lommel, Clément Foucault Differential Revision: https://developer.blender.org/D7010
Diffstat (limited to 'source/blender/blenkernel/intern/layer_test.cc')
-rw-r--r--source/blender/blenkernel/intern/layer_test.cc177
1 files changed, 177 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc
new file mode 100644
index 00000000000..84a96ed0895
--- /dev/null
+++ b/source/blender/blenkernel/intern/layer_test.cc
@@ -0,0 +1,177 @@
+/*
+ * 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) 2020 by Blender Foundation.
+ */
+#include "testing/testing.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BKE_appdir.h"
+#include "BKE_idtype.h"
+#include "BKE_layer.h"
+
+#include "BLI_string.h"
+
+#include "RE_engine.h"
+
+#include "IMB_imbuf.h"
+
+#include "CLG_log.h"
+
+#include "RNA_access.h"
+
+namespace blender::bke::tests {
+
+TEST(view_layer, aov_unique_names)
+{
+ /* Set Up */
+ CLG_init();
+ BKE_appdir_init();
+ IMB_init();
+ RE_engines_init();
+
+ Scene scene = {{NULL}};
+ IDType_ID_SCE.init_data(&scene.id);
+ ViewLayer *view_layer = static_cast<ViewLayer *>(scene.view_layers.first);
+
+ RenderEngineType *engine_type = RE_engines_find(scene.r.engine);
+ RenderEngine *engine = RE_engine_create(engine_type);
+
+ EXPECT_FALSE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_EQ(view_layer->active_aov, nullptr);
+
+ /* Add an AOV */
+ ViewLayerAOV *aov1 = BKE_view_layer_add_aov(view_layer);
+ BKE_view_layer_verify_aov(engine, &scene, view_layer);
+ EXPECT_EQ(view_layer->active_aov, aov1);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0);
+
+ /* Add a second AOV */
+ ViewLayerAOV *aov2 = BKE_view_layer_add_aov(view_layer);
+ BKE_view_layer_verify_aov(engine, &scene, view_layer);
+ EXPECT_EQ(view_layer->active_aov, aov2);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0);
+ EXPECT_FALSE((aov2->flag & AOV_CONFLICT) != 0);
+ EXPECT_TRUE(STREQ(aov1->name, "AOV"));
+ EXPECT_TRUE(STREQ(aov2->name, "AOV.001"));
+
+ /* Revert previous resolution */
+ BLI_strncpy(aov2->name, "AOV", MAX_NAME);
+ BKE_view_layer_verify_aov(engine, &scene, view_layer);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0);
+ EXPECT_FALSE((aov2->flag & AOV_CONFLICT) != 0);
+ EXPECT_TRUE(STREQ(aov1->name, "AOV"));
+ EXPECT_TRUE(STREQ(aov2->name, "AOV.001"));
+
+ /* Resolve by removing AOV resolution */
+ BKE_view_layer_remove_aov(view_layer, aov2);
+ aov2 = NULL;
+ BKE_view_layer_verify_aov(engine, &scene, view_layer);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov1->flag & AOV_CONFLICT) != 0);
+
+ /* Tear down */
+ RE_engine_free(engine);
+ RE_engines_exit();
+ IDType_ID_SCE.free_data(&scene.id);
+ IMB_exit();
+ BKE_appdir_exit();
+ CLG_exit();
+}
+
+static void test_render_pass_conflict(Scene *scene,
+ RenderEngine *engine,
+ ViewLayer *view_layer,
+ ViewLayerAOV *aov,
+ const char *render_pass_name,
+ const char *rna_prop_name)
+{
+ PointerRNA ptr;
+ RNA_pointer_create(&scene->id, &RNA_ViewLayer, view_layer, &ptr);
+ RNA_boolean_set(&ptr, rna_prop_name, false);
+
+ /* Rename to Conflicting name */
+ BLI_strncpy(aov->name, render_pass_name, MAX_NAME);
+ BKE_view_layer_verify_aov(engine, scene, view_layer);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov->flag & AOV_CONFLICT) != 0);
+ EXPECT_TRUE(STREQ(aov->name, render_pass_name));
+
+ /* Activate render pass */
+ RNA_boolean_set(&ptr, rna_prop_name, true);
+ BKE_view_layer_verify_aov(engine, scene, view_layer);
+ EXPECT_FALSE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_TRUE((aov->flag & AOV_CONFLICT) != 0);
+ EXPECT_TRUE(STREQ(aov->name, render_pass_name));
+
+ /* Deactivate render pass */
+ RNA_boolean_set(&ptr, rna_prop_name, false);
+ BKE_view_layer_verify_aov(engine, scene, view_layer);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov->flag & AOV_CONFLICT) != 0);
+ EXPECT_TRUE(STREQ(aov->name, render_pass_name));
+}
+
+TEST(view_layer, aov_conflict)
+{
+ /* Set Up */
+ CLG_init();
+ BKE_appdir_init();
+ IMB_init();
+ RE_engines_init();
+
+ Scene scene = {{NULL}};
+ IDType_ID_SCE.init_data(&scene.id);
+ ViewLayer *view_layer = static_cast<ViewLayer *>(scene.view_layers.first);
+
+ RenderEngineType *engine_type = RE_engines_find(scene.r.engine);
+ RenderEngine *engine = RE_engine_create(engine_type);
+
+ EXPECT_FALSE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_EQ(view_layer->active_aov, nullptr);
+
+ /* Add an AOV */
+ ViewLayerAOV *aov = BKE_view_layer_add_aov(view_layer);
+ BKE_view_layer_verify_aov(engine, &scene, view_layer);
+ EXPECT_EQ(view_layer->active_aov, aov);
+ EXPECT_TRUE(BKE_view_layer_has_valid_aov(view_layer));
+ EXPECT_FALSE((aov->flag & AOV_CONFLICT) != 0);
+
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Depth", "use_pass_z");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Normal", "use_pass_normal");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Mist", "use_pass_mist");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Shadow", "use_pass_shadow");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "AO", "use_pass_ambient_occlusion");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Emit", "use_pass_emit");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "Env", "use_pass_environment");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "DiffDir", "use_pass_diffuse_direct");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "DiffCol", "use_pass_diffuse_color");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "GlossDir", "use_pass_glossy_direct");
+ test_render_pass_conflict(&scene, engine, view_layer, aov, "GlossCol", "use_pass_glossy_color");
+
+ /* Tear down */
+ RE_engine_free(engine);
+ RE_engines_exit();
+ IDType_ID_SCE.free_data(&scene.id);
+ IMB_exit();
+ BKE_appdir_exit();
+ CLG_exit();
+}
+
+} // namespace blender::bke::tests