diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-08 09:54:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 09:54:59 -0300 |
| commit | b67f98272394d6f20913d471c2db9067a61d25dc (patch) | |
| tree | 3c97ac78cdce802acaf0840da84a8cc47dcb4833 | |
| parent | 978505a90a3878c213bde89271dfa521b8f99850 (diff) | |
| parent | c101dd5fa62708b5c8175a9d8b0bfedd2b306961 (diff) | |
Merge pull request #20681 from DavidSichma/master
Keeping track of discard
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 4 | ||||
| -rw-r--r-- | drivers/gles3/shader_compiler_gles3.cpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 6c7f767733..5ac2af6e5c 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -704,6 +704,10 @@ String ShaderCompilerGLES2::_dump_node_code(SL::Node *p_node, int p_level, Gener } code += ";\n"; } else if (cf_node->flow_op == SL::FLOW_OP_DISCARD) { + if (p_actions.usage_flag_pointers.has("DISCARD") && !used_flag_pointers.has("DISCARD")) { + *p_actions.usage_flag_pointers["DISCARD"] = true; + used_flag_pointers.insert("DISCARD"); + } code += "discard;"; } else if (cf_node->flow_op == SL::FLOW_OP_CONTINUE) { code += "continue;"; diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index 95bfbd0ce5..0c353d42bb 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -702,6 +702,11 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener } } else if (cfnode->flow_op == SL::FLOW_OP_DISCARD) { + if (p_actions.usage_flag_pointers.has("DISCARD") && !used_flag_pointers.has("DISCARD")) { + *p_actions.usage_flag_pointers["DISCARD"] = true; + used_flag_pointers.insert("DISCARD"); + } + code = "discard;"; } else if (cfnode->flow_op == SL::FLOW_OP_CONTINUE) { |