Browse Source

Merge pull request #79100 from KoBeWi/[filter,_filter,_filter,_filter,_filter,_filter]

Allow more hint types for uniform arrays
Yuri Sizov 2 years ago
parent
commit
65cc4db0ae
1 changed files with 6 additions and 1 deletions
  1. 6 1
      servers/rendering/shader_language.cpp

+ 6 - 1
servers/rendering/shader_language.cpp

@@ -8619,7 +8619,12 @@ Error ShaderLanguage::_parse_shader(const HashMap<StringName, FunctionInfo> &p_f
 							}
 
 							if (uniform.array_size > 0) {
-								if (tk.type != TK_HINT_SOURCE_COLOR) {
+								static Vector<int> supported_hints = {
+									TK_HINT_SOURCE_COLOR, TK_REPEAT_DISABLE, TK_REPEAT_ENABLE,
+									TK_FILTER_LINEAR, TK_FILTER_LINEAR_MIPMAP, TK_FILTER_LINEAR_MIPMAP_ANISOTROPIC,
+									TK_FILTER_NEAREST, TK_FILTER_NEAREST_MIPMAP, TK_FILTER_NEAREST_MIPMAP_ANISOTROPIC
+								};
+								if (!supported_hints.has(tk.type)) {
 									_set_error(RTR("This hint is not supported for uniform arrays."));
 									return ERR_PARSE_ERROR;
 								}