Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak shader errors for features only usable in GLES3 #46755

Merged
merged 1 commit into from
Mar 7, 2021
Merged

Tweak shader errors for features only usable in GLES3 #46755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions servers/visual/shader_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2230,7 +2230,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, OperatorNode *p
arglist += get_datatype_name(builtin_func_defs[builtin_idx].args[i]);
}

String err = "Built-in function \"" + String(name) + "(" + arglist + ")\" is supported only on high-end platform!";
String err = "Built-in function \"" + String(name) + "(" + arglist + ")\" is only supported on the GLES3 backend, but your project is using GLES2.";
_set_error(err);
return false;
}
Expand Down Expand Up @@ -3988,7 +3988,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
bool unknown_size = false;

if (VisualServer::get_singleton()->is_low_end() && is_const) {
_set_error("Local const arrays are supported only on high-end platform!");
_set_error("Local const arrays are only supported on the GLES3 backend, but your project is using GLES2.");
return ERR_PARSE_ERROR;
}

Expand Down Expand Up @@ -4029,7 +4029,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
if (tk.type == TK_OP_ASSIGN) {

if (VisualServer::get_singleton()->is_low_end()) {
_set_error("Array initialization is supported only on high-end platform!");
_set_error("Array initialization is only supported on the GLES3 backend, but your project is using GLES2.");
return ERR_PARSE_ERROR;
}

Expand Down Expand Up @@ -4314,7 +4314,7 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
} else if (tk.type == TK_CF_SWITCH) {

if (VisualServer::get_singleton()->is_low_end()) {
_set_error("\"switch\" operator is supported only on high-end platform!");
_set_error("\"switch\" operator is only supported on the GLES3 backend, but your project is using GLES2.");
return ERR_PARSE_ERROR;
}

Expand Down Expand Up @@ -4824,7 +4824,7 @@ Error ShaderLanguage::_validate_datatype(DataType p_type) {
}

if (invalid_type) {
_set_error(vformat("\"%s\" type is supported only on high-end platform!", get_datatype_name(p_type)));
_set_error(vformat("\"%s\" type is only supported on the GLES3 backend, but your project is using GLES2.", get_datatype_name(p_type)));
return ERR_UNAVAILABLE;
}
}
Expand Down