godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix ternary expression for structs in shaders

Browse Source
This commit is contained in:
Chaosus
2025-10-05 12:09:28 +03:00
parent 06827c91c6
commit fe1447de0c
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
servers/rendering/shader_language.cpp
View File

@@ -1555,10 +1555,11 @@ bool ShaderLanguage::_find_identifier(const BlockNode *p_block, bool p_allow_rea
return false; return false;
} }
bool ShaderLanguage::_validate_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op, DataType *r_ret_type, int *r_ret_size) { bool ShaderLanguage::_validate_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op, DataType *r_ret_type, int *r_ret_size, StringName *r_ret_struct_name) {
bool valid = false; bool valid = false;
DataType ret_type = TYPE_VOID; DataType ret_type = TYPE_VOID;
int ret_size = 0; int ret_size = 0;
String ret_struct_name;
switch (p_op->op) { switch (p_op->op) {
case OP_EQUAL: case OP_EQUAL:
@@ -2003,7 +2004,23 @@ bool ShaderLanguage::_validate_operator(const BlockNode *p_block, const Function
DataType nb = p_op->arguments[1]->get_datatype(); DataType nb = p_op->arguments[1]->get_datatype();
DataType nc = p_op->arguments[2]->get_datatype(); DataType nc = p_op->arguments[2]->get_datatype();
valid = na == TYPE_BOOL && (nb == nc) && !is_sampler_type(nb); bool is_same = false;
if (nb == nc) {
is_same = true;
if (nb == TYPE_STRUCT) {
String tb = p_op->arguments[1]->get_datatype_name();
String tc = p_op->arguments[2]->get_datatype_name();
if (tb != tc) {
break;
}
ret_struct_name = tb;
}
}
valid = na == TYPE_BOOL && is_same && !is_sampler_type(nb);
ret_type = nb; ret_type = nb;
ret_size = sa; ret_size = sa;
} break; } break;
@@ -2018,6 +2035,9 @@ bool ShaderLanguage::_validate_operator(const BlockNode *p_block, const Function
if (r_ret_size) { if (r_ret_size) {
*r_ret_size = ret_size; *r_ret_size = ret_size;
} }
if (r_ret_struct_name) {
*r_ret_struct_name = ret_struct_name;
}
if (valid && (!p_block || p_block->use_op_eval)) { if (valid && (!p_block || p_block->use_op_eval)) {
// Need to be placed here and not in the `_reduce_expression` because otherwise expressions like `1 + 2 / 2` will not work correctly. // Need to be placed here and not in the `_reduce_expression` because otherwise expressions like `1 + 2 / 2` will not work correctly.
@@ -7699,7 +7719,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
expression.write[next_op - 1].is_op = false; expression.write[next_op - 1].is_op = false;
expression.write[next_op - 1].node = op; expression.write[next_op - 1].node = op;
if (!_validate_operator(p_block, p_function_info, op, &op->return_cache, &op->return_array_size)) { if (!_validate_operator(p_block, p_function_info, op, &op->return_cache, &op->return_array_size, &op->struct_name)) {
if (error_set) { if (error_set) {
return nullptr; return nullptr;
} }
@@ -7709,7 +7729,12 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
if (i > 0) { if (i > 0) {
at += ", "; at += ", ";
} }
at += get_datatype_name(op->arguments[i]->get_datatype()); DataType dt = op->arguments[i]->get_datatype();
if (dt == TYPE_STRUCT) {
at += op->arguments[i]->get_datatype_name();
} else {
at += get_datatype_name(dt);
}
if (!op->arguments[i]->is_indexed() && op->arguments[i]->get_array_size() > 0) { if (!op->arguments[i]->is_indexed() && op->arguments[i]->get_array_size() > 0) {
at += "["; at += "[";
at += itos(op->arguments[i]->get_array_size()); at += itos(op->arguments[i]->get_array_size());

2
servers/rendering/shader_language.h
View File

@@ -1132,7 +1132,7 @@ private:
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
bool _is_operator_assign(Operator p_op) const; bool _is_operator_assign(Operator p_op) const;
bool _validate_assign(Node *p_node, const FunctionInfo &p_function_info, String *r_message = nullptr); bool _validate_assign(Node *p_node, const FunctionInfo &p_function_info, String *r_message = nullptr);
bool _validate_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op, DataType *r_ret_type = nullptr, int *r_ret_size = nullptr); bool _validate_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op, DataType *r_ret_type = nullptr, int *r_ret_size = nullptr, StringName *r_ret_struct_name = nullptr);
Vector<Scalar> _get_node_values(const BlockNode *p_block, const FunctionInfo &p_function_info, Node *p_node); Vector<Scalar> _get_node_values(const BlockNode *p_block, const FunctionInfo &p_function_info, Node *p_node);
bool _eval_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op); bool _eval_operator(const BlockNode *p_block, const FunctionInfo &p_function_info, OperatorNode *p_op);