-
-
Notifications
You must be signed in to change notification settings - Fork 21.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement async shader compilation plus caching for GL ES 3
Async. compilation via ubershader is currently available in the scene and particles shaders only. Bonus: - Use `#if defined()` syntax for not true conditionals, so they don't unnecessarily take a bit in the version flagset. - Remove unused `ENABLE_CLIP_ALPHA` from scene shader. - Remove unused `PARTICLES_COPY` from the particles shader. - Remove unused uniform related code. - Shader language/compiler: use ordered hash maps for deterministic code generation (needed for caching).
- Loading branch information
1 parent
b6f04df
commit 4c71078
Showing
43 changed files
with
2,161 additions
and
661 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /*************************************************************************/ | ||
| /* threaded_callable_queue.h */ | ||
| /*************************************************************************/ | ||
| /* This file is part of: */ | ||
| /* GODOT ENGINE */ | ||
| /* https://godotengine.org */ | ||
| /*************************************************************************/ | ||
| /* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ | ||
| /* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ | ||
| /* */ | ||
| /* Permission is hereby granted, free of charge, to any person obtaining */ | ||
| /* a copy of this software and associated documentation files (the */ | ||
| /* "Software"), to deal in the Software without restriction, including */ | ||
| /* without limitation the rights to use, copy, modify, merge, publish, */ | ||
| /* distribute, sublicense, and/or sell copies of the Software, and to */ | ||
| /* permit persons to whom the Software is furnished to do so, subject to */ | ||
| /* the following conditions: */ | ||
| /* */ | ||
| /* The above copyright notice and this permission notice shall be */ | ||
| /* included in all copies or substantial portions of the Software. */ | ||
| /* */ | ||
| /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ | ||
| /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ | ||
| /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ | ||
| /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ | ||
| /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ | ||
| /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ | ||
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
| /*************************************************************************/ | ||
|
|
||
| #ifndef THREADED_CALLABLE_QUEUE_H | ||
| #define THREADED_CALLABLE_QUEUE_H | ||
|
|
||
| #include "core/local_vector.h" | ||
| #include "core/ordered_hash_map.h" | ||
| #include "core/os/mutex.h" | ||
| #include "core/os/semaphore.h" | ||
| #include "core/os/thread.h" | ||
|
|
||
| #include <functional> | ||
|
|
||
| template <class K> | ||
| class ThreadedCallableQueue { | ||
| public: | ||
| using Job = std::function<void()>; | ||
|
|
||
| private: | ||
| bool exit; | ||
| Thread thread; | ||
| BinaryMutex mutex; | ||
| Semaphore sem; | ||
| OrderedHashMap<K, Job> queue; | ||
|
|
||
| static void _thread_func(void *p_user_data); | ||
|
|
||
| public: | ||
| void enqueue(K p_key, Job p_job); | ||
| void cancel(K p_key); | ||
|
|
||
| ThreadedCallableQueue(); | ||
| ~ThreadedCallableQueue(); | ||
| }; | ||
|
|
||
| template <class K> | ||
| void ThreadedCallableQueue<K>::_thread_func(void *p_user_data) { | ||
| ThreadedCallableQueue *self = static_cast<ThreadedCallableQueue *>(p_user_data); | ||
|
|
||
| while (true) { | ||
| self->sem.wait(); | ||
| self->mutex.lock(); | ||
| if (self->exit) { | ||
| self->mutex.unlock(); | ||
| break; | ||
| } | ||
|
|
||
| typename OrderedHashMap<K, Job>::Element E = self->queue.front(); | ||
| // Defense about implementation bugs (excessive posts) | ||
| if (!E) { | ||
| ERR_PRINT("Semaphore unlocked, the queue is empty. Bug?"); | ||
| self->mutex.unlock(); | ||
| // --- Defense end | ||
| } else { | ||
| LocalVector<Job> jobs; | ||
| jobs.push_back(E.value()); | ||
| self->queue.erase(E); | ||
| self->mutex.unlock(); | ||
|
|
||
| for (uint32_t i = 0; i < jobs.size(); i++) { | ||
| jobs[i](); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| self->mutex.lock(); | ||
| for (typename OrderedHashMap<K, Job>::Element E = self->queue.front(); E; E = E.next()) { | ||
| Job job = E.value(); | ||
| job(); | ||
| } | ||
| self->mutex.unlock(); | ||
| } | ||
|
|
||
| template <class K> | ||
| void ThreadedCallableQueue<K>::enqueue(K p_key, Job p_job) { | ||
| MutexLock lock(mutex); | ||
| ERR_FAIL_COND(exit); | ||
| ERR_FAIL_COND(queue.has(p_key)); | ||
| queue.insert(p_key, p_job); | ||
| sem.post(); | ||
| } | ||
|
|
||
| template <class K> | ||
| void ThreadedCallableQueue<K>::cancel(K p_key) { | ||
| MutexLock lock(mutex); | ||
| ERR_FAIL_COND(exit); | ||
| if (queue.erase(p_key)) { | ||
| sem.wait(); | ||
| } | ||
| } | ||
|
|
||
| template <class K> | ||
| ThreadedCallableQueue<K>::ThreadedCallableQueue() : | ||
| exit(false) { | ||
| thread.start(&_thread_func, this); | ||
| } | ||
|
|
||
| template <class K> | ||
| ThreadedCallableQueue<K>::~ThreadedCallableQueue() { | ||
| exit = true; | ||
| sem.post(); | ||
| thread.wait_to_finish(); | ||
| } | ||
|
|
||
| #endif // THREADED_CALLABLE_QUEUE_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.