asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #36187 from Chaosus/shader_forbid_out_samplers

Browse source 
Prevent usage 'out' modifier on opaque shader types (textures currently)
This commit is contained in:
Yuri Roubinsky 2020-02-13 23:19:59 +03:00 committed by GitHub
commit 234d355081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servers/visual/shader_language.cpp
View file

@ -6273,6 +6273,13 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
if (qualifier == ARGUMENT_QUALIFIER_OUT || qualifier == ARGUMENT_QUALIFIER_INOUT) {
if (is_sampler_type(get_token_datatype(tk.type))) {
_set_error("Opaque types cannot be output parameters.");
return ERR_PARSE_ERROR;
}
}
if (is_struct) { if (is_struct) {
ptype = TYPE_STRUCT; ptype = TYPE_STRUCT;
} else { } else {