diff options
author | Jeroen Bakker <jbakker> | 2020-02-20 16:53:53 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-02-21 13:13:43 +0300 |
commit | be2bc97eba499c48e3856c8e5ec4d869e28b4d04 (patch) | |
tree | 41d8d8fd5ec205e5fa00628aaf0f1603cb5e7825 /source/blender/nodes | |
parent | 1f8f4c8cfeaf02754f3259f9eb811ada0ed3499e (diff) |
EEVEE: Render Passes
This patch adds new render passes to EEVEE. These passes include:
* Emission
* Diffuse Light
* Diffuse Color
* Glossy Light
* Glossy Color
* Environment
* Volume Scattering
* Volume Transmission
* Bloom
* Shadow
With these passes it will be possible to use EEVEE effectively for
compositing. During development we kept a close eye on how to get similar
results compared to cycles render passes there are some differences that
are related to how EEVEE works. For EEVEE we combined the passes to
`Diffuse` and `Specular`. There are no transmittance or sss passes anymore.
Cycles will be changed accordingly.
Cycles volume transmittance is added to multiple surface col passes. For
EEVEE we left the volume transmittance as a separate pass.
Known Limitations
* All materials that use alpha blending will not be rendered in the render
passes. Other transparency modes are supported.
* More GPU memory is required to store the render passes. When rendering
a HD image with all render passes enabled at max extra 570MB GPU memory is
required.
Implementation Details
An overview of render passes have been described in
https://wiki.blender.org/wiki/Source/Render/EEVEE/RenderPasses
Future Developments
* In this implementation the materials are re-rendered for Diffuse/Glossy
and Emission passes. We could use multi target rendering to improve the
render speed.
* Other passes can be added later
* Don't render material based passes when only requesting AO or Shadow.
* Add more passes to the system. These could include Cryptomatte, AOV's, Vector,
ObjectID, MaterialID, UV.
Reviewed By: Clément Foucault
Differential Revision: https://developer.blender.org/D6331
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 7 | ||||
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 19 |
2 files changed, 17 insertions, 9 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 89349d91f94..93f2ba44a3a 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -281,8 +281,11 @@ void ntreeCompositUpdateRLayers(bNodeTree *ntree) } } -void ntreeCompositRegisterPass( - bNodeTree *ntree, Scene *scene, ViewLayer *view_layer, const char *name, int type) +void ntreeCompositRegisterPass(bNodeTree *ntree, + Scene *scene, + ViewLayer *view_layer, + const char *name, + eNodeSocketDatatype type) { bNode *node; diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index b74f325a3fa..f8a97868959 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -72,13 +72,14 @@ static bNodeSocketTemplate cmp_node_rlayers_out[] = { {SOCK_RGBA, 0, N_(RE_PASSNAME_SUBSURFACE_COLOR), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, {-1, 0, ""}, }; +#define MAX_LEGACY_SOCKET_INDEX 30 static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node, const char *name, const char *passname, int rres_index, - int type, + eNodeSocketDatatype type, int is_rlayers, LinkNodePair *available_sockets, int *prev_index) @@ -94,8 +95,8 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, * New sockets are placed behind the previously traversed one, * but always after the first 31. */ int after_index = *prev_index; - if (is_rlayers && after_index < 30) { - after_index = 30; + if (is_rlayers && after_index < MAX_LEGACY_SOCKET_INDEX) { + after_index = MAX_LEGACY_SOCKET_INDEX; } if (rres_index >= 0) { @@ -238,8 +239,12 @@ typedef struct RLayerUpdateData { int prev_index; } RLayerUpdateData; -void node_cmp_rlayers_register_pass( - bNodeTree *ntree, bNode *node, Scene *scene, ViewLayer *view_layer, const char *name, int type) +void node_cmp_rlayers_register_pass(bNodeTree *ntree, + bNode *node, + Scene *scene, + ViewLayer *view_layer, + const char *name, + eNodeSocketDatatype type) { RLayerUpdateData *data = node->storage; @@ -389,7 +394,7 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node, bool rl break; } } - if (!link && (!rlayer || sock_index > 30)) { + if (!link && (!rlayer || sock_index > MAX_LEGACY_SOCKET_INDEX)) { MEM_freeN(sock->storage); nodeRemoveSocket(ntree, node, sock); } @@ -508,7 +513,7 @@ const char *node_cmp_rlayers_sock_to_pass(int sock_index) RE_PASSNAME_SUBSURFACE_INDIRECT, RE_PASSNAME_SUBSURFACE_COLOR, }; - if (sock_index > 30) { + if (sock_index > MAX_LEGACY_SOCKET_INDEX) { return NULL; } return sock_to_passname[sock_index]; |