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

Merge pull request #42215 from Chaosus/forbid_invalid_varyings 

Forbids varying declaration in particles and sky shaders
This commit is contained in:
Rémi Verschelde 2020-09-22 16:37:14 +02:00 committed by GitHub
parent 5824766a3c 53740c69df
commit 466a6d75e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/rendering/shader_language.cpp
View File

@ -6099,6 +6099,14 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
case TK_UNIFORM: case TK_UNIFORM:
case TK_VARYING: { case TK_VARYING: {
bool uniform = tk.type == TK_UNIFORM; bool uniform = tk.type == TK_UNIFORM;
if (!uniform) {
if (shader_type_identifier == "particles" || shader_type_identifier == "sky") {
_set_error(vformat("Varyings cannot be used in '%s' shaders!", shader_type_identifier));
return ERR_PARSE_ERROR;
}
}
DataPrecision precision = PRECISION_DEFAULT; DataPrecision precision = PRECISION_DEFAULT;
DataInterpolation interpolation = INTERPOLATION_SMOOTH; DataInterpolation interpolation = INTERPOLATION_SMOOTH;
DataType type; DataType type;