From d0c42da961e87b936ad3f82fd45ac6f577a99e6b Mon Sep 17 00:00:00 2001 From: Daniel Doran Date: Sun, 24 Sep 2017 01:27:12 -0600 Subject: Discarding now works in shaders "discard" has been added to the list of recognised keywords. A flag specifing when discarding is allowed is now set correctly. --- servers/visual/shader_language.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'servers') diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index ec3337686f..595decb529 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -267,6 +267,7 @@ const ShaderLanguage::KeyWord ShaderLanguage::keyword_list[] = { { TK_CF_BREAK, "break" }, { TK_CF_CONTINUE, "continue" }, { TK_CF_RETURN, "return" }, + { TK_CF_DISCARD, "discard" }, { TK_UNIFORM, "uniform" }, { TK_VARYING, "varying" }, { TK_ARG_IN, "in" }, @@ -3804,6 +3805,10 @@ Error ShaderLanguage::_parse_shader(const Map &p_funct func_node->return_type = type; func_node->return_precision = precision; + if (p_functions.has(name)) { + func_node->can_discard = p_functions[name].can_discard; + } + func_node->body = alloc_node(); func_node->body->parent_function = func_node; -- cgit v1.2.3