godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11532 from GiantBlargg/master 

Discarding now works in shaders
This commit is contained in:
Rémi Verschelde 2017-09-24 16:02:08 +02:00 committed by GitHub
parent ebaf2d89e9 d0c42da961
commit a4fe784752
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/visual/shader_language.cpp
View File

@ -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;