godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #63960 from bitsawer/fix-macro-expansion

Browse Source
This commit is contained in:
Yuri Rubinsky
2022-08-19 23:37:47 +03:00
committed by GitHub
parent fafd15014f 691e067ef5
commit 8779f51a5e
2 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
servers/rendering/shader_preprocessor.h
View File

@@ -192,8 +192,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);