mirror of
https://github.com/godotengine/godot.git
synced 2025-11-01 06:01:14 +00:00
Enable shadow warnings and fix raised errors
This commit is contained in:
parent
fd4a06c515
commit
71ee65dc57
27 changed files with 779 additions and 761 deletions
|
|
@ -436,7 +436,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
String code;
|
||||
|
||||
switch (p_node->type) {
|
||||
case SL::Node::TYPE_SHADER: {
|
||||
case SL::Node::NODE_TYPE_SHADER: {
|
||||
SL::ShaderNode *pnode = (SL::ShaderNode *)p_node;
|
||||
|
||||
for (int i = 0; i < pnode->render_modes.size(); i++) {
|
||||
|
|
@ -781,11 +781,11 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
|
||||
//code+=dump_node_code(pnode->body,p_level);
|
||||
} break;
|
||||
case SL::Node::TYPE_STRUCT: {
|
||||
case SL::Node::NODE_TYPE_STRUCT: {
|
||||
} break;
|
||||
case SL::Node::TYPE_FUNCTION: {
|
||||
case SL::Node::NODE_TYPE_FUNCTION: {
|
||||
} break;
|
||||
case SL::Node::TYPE_BLOCK: {
|
||||
case SL::Node::NODE_TYPE_BLOCK: {
|
||||
SL::BlockNode *bnode = (SL::BlockNode *)p_node;
|
||||
|
||||
//variables
|
||||
|
|
@ -796,7 +796,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
for (int i = 0; i < bnode->statements.size(); i++) {
|
||||
String scode = _dump_node_code(bnode->statements[i], p_level, r_gen_code, p_actions, p_default_actions, p_assigning);
|
||||
|
||||
if (bnode->statements[i]->type == SL::Node::TYPE_CONTROL_FLOW || bnode->single_statement) {
|
||||
if (bnode->statements[i]->type == SL::Node::NODE_TYPE_CONTROL_FLOW || bnode->single_statement) {
|
||||
code += scode; //use directly
|
||||
if (bnode->use_comma_between_statements && i + 1 < bnode->statements.size()) {
|
||||
code += ",";
|
||||
|
|
@ -810,7 +810,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_VARIABLE_DECLARATION: {
|
||||
case SL::Node::NODE_TYPE_VARIABLE_DECLARATION: {
|
||||
SL::VariableDeclarationNode *vdnode = (SL::VariableDeclarationNode *)p_node;
|
||||
|
||||
String declaration;
|
||||
|
|
@ -868,7 +868,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
|
||||
code += declaration;
|
||||
} break;
|
||||
case SL::Node::TYPE_VARIABLE: {
|
||||
case SL::Node::NODE_TYPE_VARIABLE: {
|
||||
SL::VariableNode *vnode = (SL::VariableNode *)p_node;
|
||||
bool use_fragment_varying = false;
|
||||
|
||||
|
|
@ -961,7 +961,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_ARRAY_CONSTRUCT: {
|
||||
case SL::Node::NODE_TYPE_ARRAY_CONSTRUCT: {
|
||||
SL::ArrayConstructNode *acnode = (SL::ArrayConstructNode *)p_node;
|
||||
int sz = acnode->initializer.size();
|
||||
if (acnode->datatype == SL::TYPE_STRUCT) {
|
||||
|
|
@ -981,7 +981,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
code += ")";
|
||||
} break;
|
||||
case SL::Node::TYPE_ARRAY: {
|
||||
case SL::Node::NODE_TYPE_ARRAY: {
|
||||
SL::ArrayNode *anode = (SL::ArrayNode *)p_node;
|
||||
bool use_fragment_varying = false;
|
||||
|
||||
|
|
@ -1072,7 +1072,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_CONSTANT: {
|
||||
case SL::Node::NODE_TYPE_CONSTANT: {
|
||||
SL::ConstantNode *cnode = (SL::ConstantNode *)p_node;
|
||||
|
||||
if (cnode->array_size == 0) {
|
||||
|
|
@ -1099,7 +1099,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_OPERATOR: {
|
||||
case SL::Node::NODE_TYPE_OPERATOR: {
|
||||
SL::OperatorNode *onode = (SL::OperatorNode *)p_node;
|
||||
|
||||
switch (onode->op) {
|
||||
|
|
@ -1130,7 +1130,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
case SL::OP_CALL:
|
||||
case SL::OP_STRUCT:
|
||||
case SL::OP_CONSTRUCT: {
|
||||
ERR_FAIL_COND_V(onode->arguments[0]->type != SL::Node::TYPE_VARIABLE, String());
|
||||
ERR_FAIL_COND_V(onode->arguments[0]->type != SL::Node::NODE_TYPE_VARIABLE, String());
|
||||
const SL::VariableNode *vnode = static_cast<const SL::VariableNode *>(onode->arguments[0]);
|
||||
const SL::FunctionNode *func = nullptr;
|
||||
const bool is_internal_func = internal_functions.has(vnode->name);
|
||||
|
|
@ -1200,12 +1200,12 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
bool done = false;
|
||||
do {
|
||||
switch (node->type) {
|
||||
case SL::Node::TYPE_VARIABLE: {
|
||||
case SL::Node::NODE_TYPE_VARIABLE: {
|
||||
name = static_cast<const SL::VariableNode *>(node)->name;
|
||||
done = true;
|
||||
found = true;
|
||||
} break;
|
||||
case SL::Node::TYPE_MEMBER: {
|
||||
case SL::Node::NODE_TYPE_MEMBER: {
|
||||
node = static_cast<const SL::MemberNode *>(node)->owner;
|
||||
} break;
|
||||
default: {
|
||||
|
|
@ -1227,12 +1227,12 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
bool correct_texture_uniform = false;
|
||||
|
||||
switch (onode->arguments[i]->type) {
|
||||
case SL::Node::TYPE_VARIABLE: {
|
||||
case SL::Node::NODE_TYPE_VARIABLE: {
|
||||
const SL::VariableNode *varnode = static_cast<const SL::VariableNode *>(onode->arguments[i]);
|
||||
texture_uniform = varnode->name;
|
||||
correct_texture_uniform = true;
|
||||
} break;
|
||||
case SL::Node::TYPE_ARRAY: {
|
||||
case SL::Node::NODE_TYPE_ARRAY: {
|
||||
const SL::ArrayNode *anode = static_cast<const SL::ArrayNode *>(onode->arguments[i]);
|
||||
texture_uniform = anode->name;
|
||||
correct_texture_uniform = true;
|
||||
|
|
@ -1361,7 +1361,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_CONTROL_FLOW: {
|
||||
case SL::Node::NODE_TYPE_CONTROL_FLOW: {
|
||||
SL::ControlFlowNode *cfnode = (SL::ControlFlowNode *)p_node;
|
||||
if (cfnode->flow_op == SL::FLOW_OP_IF) {
|
||||
code += _mktab(p_level) + "if (" + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + ")\n";
|
||||
|
|
@ -1413,7 +1413,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
|
|||
}
|
||||
|
||||
} break;
|
||||
case SL::Node::TYPE_MEMBER: {
|
||||
case SL::Node::NODE_TYPE_MEMBER: {
|
||||
SL::MemberNode *mnode = (SL::MemberNode *)p_node;
|
||||
code = _dump_node_code(mnode->owner, p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + "." + mnode->name;
|
||||
if (mnode->index_expression != nullptr) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue