godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50728 from Chaosus/shader_varying_enchancements

Browse Source 
Allow using vertex varying in custom functions under any circumstances
This commit is contained in:
Rémi Verschelde 2021-07-26 12:17:40 +02:00 committed by GitHub
commit 9b9e09f675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
servers/rendering/shader_language.cpp
View File

@ -912,6 +912,8 @@ void ShaderLanguage::clear() {
completion_class = SubClassTag::TAG_GLOBAL; completion_class = SubClassTag::TAG_GLOBAL;
completion_struct = StringName(); completion_struct = StringName();
unknown_varying_usages.clear();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
used_constants.clear(); used_constants.clear();
used_varyings.clear(); used_varyings.clear();
@ -3348,8 +3350,11 @@ bool ShaderLanguage::_validate_varying_assign(ShaderNode::Varying &p_varying, St
bool ShaderLanguage::_validate_varying_using(ShaderNode::Varying &p_varying, String *r_message) { bool ShaderLanguage::_validate_varying_using(ShaderNode::Varying &p_varying, String *r_message) {
switch (p_varying.stage) { switch (p_varying.stage) {
case ShaderNode::Varying::STAGE_UNKNOWN: case ShaderNode::Varying::STAGE_UNKNOWN:
*r_message = RTR("Varying must be assigned before using!"); VaryingUsage usage;
return false; usage.var = &p_varying;
usage.line = tk_line;
unknown_varying_usages.push_back(usage);
break;
case ShaderNode::Varying::STAGE_VERTEX: case ShaderNode::Varying::STAGE_VERTEX:
if (current_function == varying_function_names.fragment) { if (current_function == varying_function_names.fragment) {
p_varying.stage = ShaderNode::Varying::STAGE_VERTEX_TO_FRAGMENT; p_varying.stage = ShaderNode::Varying::STAGE_VERTEX_TO_FRAGMENT;
@ -3380,6 +3385,19 @@ bool ShaderLanguage::_validate_varying_using(ShaderNode::Varying &p_varying, Str
return true; return true;
} }
bool ShaderLanguage::_check_varying_usages(int *r_error_line, String *r_error_message) const {
for (const List<ShaderLanguage::VaryingUsage>::Element *E = unknown_varying_usages.front(); E; E = E->next()) {
ShaderNode::Varying::Stage stage = E->get().var->stage;
if (stage != ShaderNode::Varying::STAGE_UNKNOWN && stage != ShaderNode::Varying::STAGE_VERTEX && stage != ShaderNode::Varying::STAGE_VERTEX_TO_FRAGMENT && stage != ShaderNode::Varying::STAGE_VERTEX_TO_LIGHT) {
*r_error_line = E->get().line;
*r_error_message = RTR("Fragment-stage varying could not been accessed in custom function!");
return false;
}
}
return true;
}
bool ShaderLanguage::_check_node_constness(const Node *p_node) const { bool ShaderLanguage::_check_node_constness(const Node *p_node) const {
switch (p_node->type) { switch (p_node->type) {
case Node::TYPE_OPERATOR: { case Node::TYPE_OPERATOR: {
@ -7875,6 +7893,15 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
tk = _get_token(); tk = _get_token();
} }
int error_line;
String error_message;
if (!_check_varying_usages(&error_line, &error_message)) {
_set_tkpos({ 0, error_line });
_set_error(error_message);
return ERR_PARSE_ERROR;
}
return OK; return OK;
} }

8
servers/rendering/shader_language.h
View File

@ -876,6 +876,14 @@ private:
VaryingFunctionNames varying_function_names; VaryingFunctionNames varying_function_names;
struct VaryingUsage {
ShaderNode::Varying *var;
int line;
};
List<VaryingUsage> unknown_varying_usages;
bool _check_varying_usages(int *r_error_line, String *r_error_message) const;
TkPos _get_tkpos() { TkPos _get_tkpos() {
TkPos tkp; TkPos tkp;
tkp.char_idx = char_idx; tkp.char_idx = char_idx;