diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-12 11:58:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 11:58:19 +0100 |
| commit | 49122588391b5159fada6d33f136d169b5a01ae5 (patch) | |
| tree | b675cbc225b2246fede39ba050dd5f9ef5d9046a /modules/etc | |
| parent | 44e291a250c913e2308da5fcbdc1f48becdc8a1e (diff) | |
| parent | f8d03b98e7eeeb726af4f653f1fde8b063cbad14 (diff) | |
Merge pull request #45903 from reduz/improve-resoucre-load-cache
Improve resource load cache
Diffstat (limited to 'modules/etc')
| -rw-r--r-- | modules/etc/texture_loader_pkm.cpp | 2 | ||||
| -rw-r--r-- | modules/etc/texture_loader_pkm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/etc/texture_loader_pkm.cpp b/modules/etc/texture_loader_pkm.cpp index 456473672d..95db9315d5 100644 --- a/modules/etc/texture_loader_pkm.cpp +++ b/modules/etc/texture_loader_pkm.cpp @@ -42,7 +42,7 @@ struct ETC1Header { uint16_t origHeight = 0; }; -RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { +RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) { if (r_error) { *r_error = ERR_CANT_OPEN; } diff --git a/modules/etc/texture_loader_pkm.h b/modules/etc/texture_loader_pkm.h index 67fbee3a7e..2ed5e75807 100644 --- a/modules/etc/texture_loader_pkm.h +++ b/modules/etc/texture_loader_pkm.h @@ -36,7 +36,7 @@ class ResourceFormatPKM : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false); + virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE); virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; |