diff options
author | Thomas Herzog <thomas.herzog@mail.com> | 2017-07-26 15:30:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-26 15:30:04 +0200 |
commit | 9caf9fa76f93a689d63d89ef53d6dd5af42a8c0c (patch) | |
tree | adc32ad20b02d26095372b40f76fae122ee5acc2 /core | |
parent | 668f4f437f2b720373be8944c573fd9a0e07825d (diff) | |
parent | 3b88476130aa2fe1af7d089cd18a9abc72e23678 (diff) |
Merge pull request #9720 from endragor/stack-bottom
Add a way to retrieve stack bottom of the main thread
Diffstat (limited to 'core')
-rw-r--r-- | core/os/os.cpp | 7 | ||||
-rw-r--r-- | core/os/os.h | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 5a9766891d..8e4c357195 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -512,7 +512,13 @@ bool OS::check_feature_support(const String &p_feature) { return false; } +void *OS::get_stack_bottom() const { + return _stack_bottom; +} + OS::OS() { + void *volatile stack_bottom; + last_error = NULL; singleton = this; _keep_screen_on = true; // set default value to true, because this had been true before godot 2.0. @@ -525,6 +531,7 @@ OS::OS() { _render_thread_mode = RENDER_THREAD_SAFE; _allow_hidpi = true; + _stack_bottom = (void *)(&stack_bottom); } OS::~OS() { diff --git a/core/os/os.h b/core/os/os.h index 362fec8a9e..957c1d0ba7 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -60,6 +60,8 @@ class OS { char *last_error; + void *_stack_bottom; + public: enum RenderThreadMode { @@ -411,6 +413,13 @@ public: bool check_feature_support(const String &p_feature); + /** + * Returns the stack bottom of the main thread of the application. + * This may be of use when integrating languages with garbage collectors that + * need to check whether a pointer is on the stack. + */ + virtual void *get_stack_bottom() const; + bool is_hidpi_allowed() const { return _allow_hidpi; } OS(); virtual ~OS(); |