mirror of
https://github.com/godotengine/godot
synced 2024-09-05 08:48:54 +00:00
Merge pull request #11532 from GiantBlargg/master
Discarding now works in shaders
This commit is contained in:
commit
a4fe784752
|
@ -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<StringName, FunctionInfo> &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<BlockNode>();
|
||||
func_node->body->parent_function = func_node;
|
||||
|
||||
|
|
Loading…
Reference in a new issue