Merge remote-tracking branch 'lyuma/shader_sampler_flag_compat_3.2' i…

…nto shader_improvements_meta_3.2
V-Sekai · Feb 22, 2021 · 76eff36 · 76eff36
2 parents 1bd7987 + 2572fc2
commit 76eff36
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 1 deletion.
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
@@ -311,6 +311,20 @@ const ShaderLanguage::KeyWord ShaderLanguage::keyword_list[] = {
 	{ TK_HINT_ANISO_TEXTURE, "hint_aniso" },
 	{ TK_HINT_ALBEDO_TEXTURE, "hint_albedo" },
 	{ TK_HINT_BLACK_ALBEDO_TEXTURE, "hint_black_albedo" },
+	{ TK_FILTER_NEAREST, "filter_nearest" },
+	{ TK_FILTER_LINEAR, "filter_linear" },
+	{ TK_FILTER_NEAREST_MIPMAP, "filter_nearest_mipmap" },
+	{ TK_FILTER_LINEAR_MIPMAP, "filter_linear_mipmap" },
+	{ TK_FILTER_NEAREST_MIPMAP_ANISO, "filter_nearest_mipmap_aniso" },
+	{ TK_FILTER_LINEAR_MIPMAP_ANISO, "filter_linear_mipmap_aniso" },
+	{ TK_REPEAT_ENABLE, "repeat_enable" },
+	{ TK_REPEAT_DISABLE, "repeat_disable" },
+	{ TK_HINT_ROUGHNESS_NORMAL_TEXTURE, "hint_roughness_normal" },
+	{ TK_HINT_ROUGHNESS_R, "hint_roughness_r" },
+	{ TK_HINT_ROUGHNESS_G, "hint_roughness_g" },
+	{ TK_HINT_ROUGHNESS_B, "hint_roughness_b" },
+	{ TK_HINT_ROUGHNESS_A, "hint_roughness_a" },
+	{ TK_HINT_ROUGHNESS_GRAY, "hint_roughness_gray" },
 	{ TK_HINT_COLOR, "hint_color" },
 	{ TK_HINT_RANGE, "hint_range" },
 	{ TK_SHADER_TYPE, "shader_type" },
@@ -5361,11 +5375,39 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
 					//todo parse default value
 
 					tk = _get_token();
+					bool found_hint = false;
 
 					if (tk.type == TK_COLON) {
+						// no-op hints.
+						while (true) {
+							tk = _get_token();
+							if (tk.type == TK_FILTER_NEAREST ||
+									tk.type == TK_FILTER_LINEAR ||
+									tk.type == TK_FILTER_NEAREST_MIPMAP ||
+									tk.type == TK_FILTER_LINEAR_MIPMAP ||
+									tk.type == TK_FILTER_NEAREST_MIPMAP_ANISO ||
+									tk.type == TK_FILTER_LINEAR_MIPMAP_ANISO ||
+									tk.type == TK_REPEAT_ENABLE ||
+									tk.type == TK_REPEAT_DISABLE ||
+									tk.type == TK_HINT_ROUGHNESS_NORMAL_TEXTURE ||
+									tk.type == TK_HINT_ROUGHNESS_R ||
+									tk.type == TK_HINT_ROUGHNESS_G ||
+									tk.type == TK_HINT_ROUGHNESS_B ||
+									tk.type == TK_HINT_ROUGHNESS_A ||
+									tk.type == TK_HINT_ROUGHNESS_GRAY) {
+								tk = _get_token();
+								if (tk.type != TK_COMMA) {
+									break;
+								}
+							} else {
+								found_hint = true;
+								break;
+							}
+						}
+					}
+					if (found_hint) {
 						//hint
 
-						tk = _get_token();
 						if (tk.type == TK_HINT_WHITE_TEXTURE) {
 							uniform2.hint = ShaderNode::Uniform::HINT_WHITE;
 						} else if (tk.type == TK_HINT_BLACK_TEXTURE) {

diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h
@@ -157,6 +157,20 @@ class ShaderLanguage {
 		TK_HINT_ANISO_TEXTURE,
 		TK_HINT_ALBEDO_TEXTURE,
 		TK_HINT_BLACK_ALBEDO_TEXTURE,
+		TK_FILTER_NEAREST,
+		TK_FILTER_LINEAR,
+		TK_FILTER_NEAREST_MIPMAP,
+		TK_FILTER_LINEAR_MIPMAP,
+		TK_FILTER_NEAREST_MIPMAP_ANISO,
+		TK_FILTER_LINEAR_MIPMAP_ANISO,
+		TK_REPEAT_ENABLE,
+		TK_REPEAT_DISABLE,
+		TK_HINT_ROUGHNESS_NORMAL_TEXTURE,
+		TK_HINT_ROUGHNESS_R,
+		TK_HINT_ROUGHNESS_G,
+		TK_HINT_ROUGHNESS_B,
+		TK_HINT_ROUGHNESS_A,
+		TK_HINT_ROUGHNESS_GRAY,
 		TK_HINT_COLOR,
 		TK_HINT_RANGE,
 		TK_SHADER_TYPE,