diff options
| author | Yuri Rubinsky <chaosus89@gmail.com> | 2022-09-26 18:18:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 18:18:24 +0300 |
| commit | 84f2c68c84bde10026454292578e5fdcc9ab69a3 (patch) | |
| tree | 2bd341cabe7b1a7b3be82b74df1be20b188ff53b /servers/rendering/shader_preprocessor.h | |
| parent | b9a64c77366361a0d45dcdd2b330911efd1eb3f4 (diff) | |
| parent | 344aa610e3061c03662bae964575ddc95625564f (diff) | |
Merge pull request #66440 from Chaosus/shader_completion_defines
Diffstat (limited to 'servers/rendering/shader_preprocessor.h')
| -rw-r--r-- | servers/rendering/shader_preprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/shader_preprocessor.h b/servers/rendering/shader_preprocessor.h index b4e7c7199f..f1b2876891 100644 --- a/servers/rendering/shader_preprocessor.h +++ b/servers/rendering/shader_preprocessor.h @@ -218,7 +218,7 @@ private: public: typedef void (*IncludeCompletionFunction)(List<ScriptLanguage::CodeCompletionOption> *); - Error preprocess(const String &p_code, const String &p_filename, String &r_result, String *r_error_text = nullptr, List<FilePosition> *r_error_position = nullptr, List<Region> *r_regions = nullptr, HashSet<Ref<ShaderInclude>> *r_includes = nullptr, List<ScriptLanguage::CodeCompletionOption> *r_completion_options = nullptr, IncludeCompletionFunction p_include_completion_func = nullptr); + Error preprocess(const String &p_code, const String &p_filename, String &r_result, String *r_error_text = nullptr, List<FilePosition> *r_error_position = nullptr, List<Region> *r_regions = nullptr, HashSet<Ref<ShaderInclude>> *r_includes = nullptr, List<ScriptLanguage::CodeCompletionOption> *r_completion_options = nullptr, List<ScriptLanguage::CodeCompletionOption> *r_completion_defines = nullptr, IncludeCompletionFunction p_include_completion_func = nullptr); static void get_keyword_list(List<String> *r_keywords, bool p_include_shader_keywords, bool p_ignore_context_keywords = false); static void get_pragma_list(List<String> *r_pragmas); |