7e8fd2cc2c
EEVEE-Next can only store data for a single (global) closure at a time, which, when combined with ShaderToRGB nodes, requires extra care in the order that closures are evaluated. For example:  Here, after `ntree_shader_shader_to_rgba_branch` there will be 2 Diffuse nodes (the original and a copy for the ShaderToRGB branch). However, the generated code order will be something like this: ``` Diffuse (original) Diffuse (copy) ShaderToRGB // This resets closures Mix ``` So while the original node is technically "evaluated", the closure data is reset after ShaderToRGB. This patch updates the code generation to ensure closure evaluation is ordered taking ShaderToRGB branches into account, so the generated code looks like this: ``` Diffuse (copy) ShaderToRGB // This resets closures Diffuse (original) Mix ``` This also fixes ShaderToRGB support for AOVs, removes unused code, and fixes several bugs that I've found along the way that were harmless for EEVEE but broke EEVEE Next. Pull Request: https://projects.blender.org/blender/blender/pulls/117767
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
/* SPDX-FileCopyrightText: 2005 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup nodes
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <cfloat>
|
|
#include <cmath>
|
|
|
|
#include "BKE_node.hh"
|
|
|
|
#include "DNA_node_types.h"
|
|
|
|
#include "GPU_material.hh"
|
|
|
|
#include "NOD_socket_declarations.hh"
|
|
|
|
#include "node_shader_register.hh"
|
|
|
|
#ifdef WITH_MATERIALX
|
|
# include "materialx/node_parser.h"
|
|
#else
|
|
# define NODE_SHADER_MATERIALX_BEGIN NodeMaterialXFunction node_shader_materialx = nullptr;
|
|
# define NODE_SHADER_MATERIALX_END
|
|
#endif
|
|
|
|
struct bContext;
|
|
struct bNodeExecContext;
|
|
struct bNodeExecData;
|
|
struct bNodeTreeExec;
|
|
struct GPUNodeLink;
|
|
struct GPUNodeStack;
|
|
struct GPUMaterial;
|
|
|
|
bool sh_node_poll_default(const bNodeType *ntype,
|
|
const bNodeTree *ntree,
|
|
const char **r_disabled_hint);
|
|
void sh_node_type_base(bNodeType *ntype, int type, const char *name, short nclass);
|
|
void sh_fn_node_type_base(bNodeType *ntype, int type, const char *name, short nclass);
|
|
bool line_style_shader_nodes_poll(const bContext *C);
|
|
bool world_shader_nodes_poll(const bContext *C);
|
|
bool object_shader_nodes_poll(const bContext *C);
|
|
bool object_cycles_shader_nodes_poll(const bContext *C);
|
|
bool object_eevee_shader_nodes_poll(const bContext *C);
|
|
|
|
/* ********* exec data struct, remains internal *********** */
|
|
|
|
struct XYZ_to_RGB /* Transposed #imbuf_xyz_to_rgb, passed as 3x vec3. */
|
|
{
|
|
float r[3], g[3], b[3];
|
|
};
|
|
|
|
void node_gpu_stack_from_data(GPUNodeStack *gs, int type, bNodeStack *ns);
|
|
void node_data_from_gpu_stack(bNodeStack *ns, GPUNodeStack *gs);
|
|
void node_shader_gpu_bump_tex_coord(GPUMaterial *mat, bNode *node, GPUNodeLink **link);
|
|
void node_shader_gpu_default_tex_coord(GPUMaterial *mat, bNode *node, GPUNodeLink **link);
|
|
void node_shader_gpu_tex_mapping(GPUMaterial *mat,
|
|
bNode *node,
|
|
GPUNodeStack *in,
|
|
GPUNodeStack *out);
|
|
|
|
bNodeTreeExec *ntreeShaderBeginExecTree_internal(bNodeExecContext *context,
|
|
bNodeTree *ntree,
|
|
bNodeInstanceKey parent_key);
|
|
void ntreeShaderEndExecTree_internal(bNodeTreeExec *exec);
|
|
|
|
/* If depth_level is not null, only nodes where `node->runtime->tmp_flag == depth_level` will be
|
|
* executed. This allows finer control over node execution order without modifying the tree
|
|
* topology. */
|
|
void ntreeExecGPUNodes(bNodeTreeExec *exec,
|
|
GPUMaterial *mat,
|
|
bNode *output_node,
|
|
int *depth_level = nullptr);
|
|
|
|
void get_XYZ_to_RGB_for_gpu(XYZ_to_RGB *data);
|
|
|
|
bool node_socket_not_zero(const GPUNodeStack &socket);
|
|
bool node_socket_not_white(const GPUNodeStack &socket);
|
|
bool node_socket_not_black(const GPUNodeStack &socket);
|