diff options
author | bitsawer <sawerduster@gmail.com> | 2022-08-05 17:30:08 +0300 |
---|---|---|
committer | bitsawer <sawerduster@gmail.com> | 2022-08-05 17:41:24 +0300 |
commit | 691e067ef5848f9f43bb40cb68f7f656abb91688 (patch) | |
tree | f2214f5f964ffa5eddfb714b6baa8d96a133bc05 /servers/rendering/shader_preprocessor.h | |
parent | cc35a8723c4cf07bc26032f4f21d6a93f9997d20 (diff) |
Fix shader preprocessor macro expansion
Diffstat (limited to 'servers/rendering/shader_preprocessor.h')
-rw-r--r-- | servers/rendering/shader_preprocessor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/servers/rendering/shader_preprocessor.h b/servers/rendering/shader_preprocessor.h index a93fb680dd..378a7d3bdf 100644 --- a/servers/rendering/shader_preprocessor.h +++ b/servers/rendering/shader_preprocessor.h @@ -171,8 +171,7 @@ private: void expand_output_macros(int p_start, int p_line); Error expand_macros(const String &p_string, int p_line, String &r_result); - Error expand_macros(const String &p_string, int p_line, Vector<Pair<String, Define *>> p_defines, String &r_result); - Error expand_macros_once(const String &p_line, int p_line_number, Pair<String, Define *> p_define_pair, String &r_expanded); + bool expand_macros_once(const String &p_line, int p_line_number, const RBMap<String, Define *>::Element *p_define_pair, String &r_expanded); bool find_match(const String &p_string, const String &p_value, int &r_index, int &r_index_start); String next_directive(Tokenizer *p_tokenizer, const Vector<String> &p_directives); |